diff --git a/README.txt b/README.txt index 89162f2751..8e92f858f8 100644 --- a/README.txt +++ b/README.txt @@ -7,5 +7,11 @@ It contains pretty much everything you're likely to need to create most applications, and is particularly well-suited for building highly-customised GUIs, and for handling graphics and sound. +Most JUCE modules are shared under the GNU Public Licence +(GPLv2, v3, and the AGPLv3). This means that the code can +be freely copied and distributed, and costs nothing to use +in other GPL applications. One module (the juce_core module) +is permissively licensed under the ISC. + For more information, visit the website: http://www.juce.com \ No newline at end of file diff --git a/docs/JUCE readme.html b/docs/JUCE readme.html deleted file mode 100644 index 1a45d95628..0000000000 --- a/docs/JUCE readme.html +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - -JUCE - installation and compiling - - - - -
- - - -

Introduction - License - -Installation - -Building with Visual Studio - -Building with VC6 - -Building with XCode - -Building on Linux - -Building with Android - -

- -

JUCE

- -

Introduction

- -

JUCE is an all-encompassing C++ class library for developing cross-platform applications and plugins.

-

For lots more help and information, please visit the JUCE website.

-

A complete set of class documentation is available here.

- -

License

- -

JUCE is released under the Gnu Public License, -which means it can be freely copied and distributed, and costs nothing to use in open-source applications.

-

If you'd like to release a closed-source application that uses JUCE, commercial licenses are available -for a fee - click here for more information -on pricing and terms.

- -

Installation

- -

Installing the source code

- -

There are a few ways to install a copy of JUCE:

- -

The JUCE source code all lives in a folder called, unsurprisingly, juce, which you can unzip -and put somewhere on your system.

- -

Building the demo applications

- -

In the juce/extras folder, there are a few demo apps to get you started and to show off JUCE's features. -Each one contains a folder called Builds, containing various projects for different compilers and platforms. -These should all work straight out-of-the-box if you load them into the appropriate development environment. Some of them -(e.g. the audio plugin demo) may require 3rd party libraries or headers to have been installed, but I've made sure that any -include statements that may not be present have comments with a detailed explanation of what's going on, so if you hit a compile -error, just have a look at the code it's pointing to and everything should become clear.

- -

Creating a new application with the Introjucer

- -

By far the easiest way to create a new cross-platform JUCE app (or audio plugin) is to let the Introjucer -do the hard work of creating all your projects with the correct settings.

-

You can either build the Introjucer yourself from the source (in juce/extras/Introjucer), or download -a pre-built binary from SourceForge. -

If you run it and select the 'new project' menu item, it'll walk you through the stages in setting up an app or -plugin project, and will automatically spit out a collection of project files for all the different platforms and compilers -that you need.

- -

Requirements for building on different platforms

- -

Microsoft Visual Studio 2005 or later

- -

JUCE projects should build and run with no extra set-up needed in all versions of Visual Studio from 2005 onwards.

- -

By far the easiest way to create a new project is by letting the Introjucer do all the hard work, as explained above. But -if you really insist on creating one manually, here are a few tips:

-
    -
  1. Create your new application project as an 'empty' WIN32 application - avoid saying yes to -MFC or any of the other rubbish that Visual Studio might offer you.
    2. -
  2. Make sure that your project has exception handling and run-time type information (RTTI) turned ON.
    3. -
  3. Have a look at the example projects, demo projects, or the API documentation about the -JUCEApplication class to find out how to create the application launch code.
    4. -
- -

Microsoft Visual Studio 6

- -

JUCE can still be compiled with VC6, although support for this will be dropped at some point in the future... -but here are some tips for getting it going:

- -
    -
  1. Install the latest Platform SDK from Microsoft.
    2. -
  2. Set up your include and library search paths. The first few items on your include path -should look like this (obviously you might have things installed in different places, but the -order is important!): -
    C:\Program Files\Microsoft Platform SDK\include
-C:\Program Files\Microsoft Platform SDK\include\crt
-C:\Program Files\Microsoft Platform SDK\include\mfc
-C:\mycode\juce
-...
    -And the library search path should begin like this: -
    C:\Program Files\Microsoft Visual Studio\VC98\LIB
-C:\Program Files\Microsoft Platform SDK\lib
-C:\mycode\juce\bin
-...
    -
    3. -
- -

Note that there's a rather lame bug in VC6 that causes an internal compiler error if you include -filenames that are too long. This can get triggered if you put the juce folder in a deeply-nested -directory (such as your user home directory). Unfortunately I think the only workaround for this -is to move the source tree to a shallower directory.

- -

XCode on OSX

- -

Use XCode 3 or later. You might want to tick the option to install the 10.4 SDK if you want to build binaries -that are backward-compatible with 10.4 and PPCs. If you're going to build for iOS, you'll obviously need the iOS version of XCode.

- -

The easiest way to create a new application is by using the Intojucer, but here are a few tips if you're mad enough -to want to set one up manually:

- - - -

Linux with GCC

- -

Most linux distros should come with the tools you need. You may need to install the development packages of -freetype, X11 and pthreads if they're not already available.

-

If you've enabled the JUCE_USE_XINERAMA option, then you'll also need to install the Xinerama package. -And you'll need the GL and GLU libraries if you've enabled JUCE_OPENGL

-

The makefiles that are generated by the Introjucer can be run by "make CONFIG=Debug", -or "make CONFIG=Release". You can also use "make clean" to delete the -intermediate files.

- -

Android

- - - -
-

***

-
-
-

- Copyright 2005 Raw Material Software Ltd -

-
-
- - - diff --git a/docs/gpl.txt b/docs/gpl.txt deleted file mode 100644 index 45645b4b53..0000000000 --- a/docs/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/docs/images/rms_logo.gif b/docs/images/rms_logo.gif deleted file mode 100644 index bef67a05b3..0000000000 Binary files a/docs/images/rms_logo.gif and /dev/null differ diff --git a/docs/rawmat.css b/docs/rawmat.css deleted file mode 100644 index 7a0b61e285..0000000000 --- a/docs/rawmat.css +++ /dev/null @@ -1,193 +0,0 @@ -body { -color: #444444; -font-family: Tahoma, Geneva, Arial, Helvetica, sans-serif; -font-size: 0.8em; -line-height: 1.5em; -text-align: left; -background: #e0e0e0; -} - -a { color: #005888; } -a:hover { color: #1c90b0; } -a:visited { color: #006699; } -a:visited:hover { color: #1c90b0; } - -h1 { -font-family: "Arial Narrow", Tahoma, Geneva, Arial, Helvetica, sans-serif; -font-size: 1.6em; -color: #006b95; -margin: 15px 0 15px 0; -padding-left: 15px; -} - -h2 { -font-family: "Arial Narrow", Tahoma, Geneva, Arial, Helvetica, sans-serif; -font-size: 1.3em; -color: #007aac; -margin: 15px; -} - -h3 { -font-family: "Arial Narrow", Tahoma, Geneva, Arial, Helvetica, sans-serif; -font-size: 1.1em; -color: #56a7c1; -margin: 15px; -} - -p { -margin: 10px 15px 5px 15px; -} - -pre { -font-family: monospace; -font-size: 1.1em; -line-height: 1.1em; -} - -code { -font-family: monospace; -font-size: 1.2em; -line-height: 1.1em; -} - -.pageholder { -width: 800px; -min-width: 800px; -margin: 10px auto 0 auto; -background: #ffffff none; -padding: 0 !important; position: relative; } - -.banner { -height: 90px; -background: #3366cc none; line-height: 20px; font-family: Arial, Tahoma, Geneva, Helvetica, sans-serif; } - -.banner img { -float: left; -color: #ffffff; -margin: 15px 0 0 16px; -border: 0; -background: none; font-family: sans-serif; font-size: 25px; -} - -.mainsections { -margin: 6px 0px 6px 0px; -padding: 0; position: absolute; left: 390px; top: 56px; -float: left; -font-size: 13px; } - -.mainsections ul { -margin: 0; -padding: 0 0 0 10px; background-color: #3366cc; background-image: none; } - -.mainsections li { -list-style-type: none; -float: left; -width: auto; -min-width: 50; -min-height: 22px; max-height: 22px; -text-align: center; margin: 6px 4px 0px 4px; -font-size: 12px; background: url(images/inactiverightcorner.gif) no-repeat top right; } - -.mainsections a:link, .mainsections a:visited { -display: block; -color: #d0eef3; text-decoration: none; -padding: 2px 8px 0px 10px; -background: url(images/inactiveleftcorner.gif) no-repeat top left; -max-height: 20px; } - -.mainsections a:hover, .mainsections a:visited:hover { -color: #ffffff; -text-decoration: none; -padding: 2px 8px 0px 10px; -} - -.currentsection { -margin-top: 4px; -background-image: url(images/activerightcorner.gif) !important; -} - -.currentsection a:link, .currentsection a:visited { -color: #006b95 !important; -background-image: url(images/activeleftcorner.gif) !important; -} - -.currentsection a:hover, .currentsection a:visited:hover { -color: #2c93b0 !important; -} - -.subsections { -clear: both; -} - -.subsections ul { -margin: 0; -padding: 0 6px 0 6px; -} - -.subsections li { -list-style-type: none; -float: left; -margin: 0px 4px 0 4px; -background-image: url(images/inactivesubsection.gif); -background-repeat: no-repeat; -background-position: center left; -padding-left: 10px; } - -.subsections a:link, .subsections a:visited { -padding: 0 4px 0 4px; -text-decoration: none; -} - -.currentsubsection a:link, .currentsubsection a:visited { -font-weight: bold; -color: #000099; -} - -.currentsubsection { -background-image: url(images/activesubsection.gif) !important; -} - -.content { -clear: both; -float: none; -padding: 2px 5px 0 5px; -min-height: 500px; -background-image: none; -font-family: Georgia, Helvetica, sans-serif; -} - -.prop { -float: right; -width: 1px; -height: 400px; -} - -.bottomsection { -clear: both; -text-align: center; -background-image: none; -margin: 0; -padding: 15px 0 12px 0; -} - -.bottombar { -padding: 5px; -background: #3366cc none; -margin: 10px 0 10px 0 !important; -color: #ffffff; height: 26px; -font-size: 0.8em; -} - -.bottombar a, .bottombar a:visited { -color: #d0eef0 !important; -} - -.bottomtext a:hover, .bottomtext a:visited:hover { -color: #ffffff !important; -} - -.ad { -clear: both; -padding: 30px 0 0 0; -text-align: center; -} \ No newline at end of file diff --git a/extras/Demo/Builds/Android/AndroidManifest.xml b/examples/Demo/Builds/Android/AndroidManifest.xml similarity index 100% rename from extras/Demo/Builds/Android/AndroidManifest.xml rename to examples/Demo/Builds/Android/AndroidManifest.xml diff --git a/extras/Demo/Builds/Android/build.xml b/examples/Demo/Builds/Android/build.xml similarity index 100% rename from extras/Demo/Builds/Android/build.xml rename to examples/Demo/Builds/Android/build.xml diff --git a/extras/Demo/Builds/Android/jni/Android.mk b/examples/Demo/Builds/Android/jni/Android.mk similarity index 100% rename from extras/Demo/Builds/Android/jni/Android.mk rename to examples/Demo/Builds/Android/jni/Android.mk diff --git a/extras/Demo/Builds/Android/jni/Application.mk b/examples/Demo/Builds/Android/jni/Application.mk similarity index 100% rename from extras/Demo/Builds/Android/jni/Application.mk rename to examples/Demo/Builds/Android/jni/Application.mk diff --git a/extras/Demo/Builds/Android/local.properties b/examples/Demo/Builds/Android/local.properties similarity index 100% rename from extras/Demo/Builds/Android/local.properties rename to examples/Demo/Builds/Android/local.properties diff --git a/extras/Demo/Builds/Android/project.properties b/examples/Demo/Builds/Android/project.properties similarity index 100% rename from extras/Demo/Builds/Android/project.properties rename to examples/Demo/Builds/Android/project.properties diff --git a/extras/Demo/Builds/Android/res/drawable-mdpi/icon.png b/examples/Demo/Builds/Android/res/drawable-mdpi/icon.png similarity index 100% rename from extras/Demo/Builds/Android/res/drawable-mdpi/icon.png rename to examples/Demo/Builds/Android/res/drawable-mdpi/icon.png diff --git a/extras/Demo/Builds/Android/res/values/strings.xml b/examples/Demo/Builds/Android/res/values/strings.xml similarity index 100% rename from extras/Demo/Builds/Android/res/values/strings.xml rename to examples/Demo/Builds/Android/res/values/strings.xml diff --git a/extras/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java b/examples/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java similarity index 100% rename from extras/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java rename to examples/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java diff --git a/extras/Demo/Builds/Linux/Makefile b/examples/Demo/Builds/Linux/Makefile similarity index 100% rename from extras/Demo/Builds/Linux/Makefile rename to examples/Demo/Builds/Linux/Makefile diff --git a/extras/Demo/Builds/MacOSX/Icon.icns b/examples/Demo/Builds/MacOSX/Icon.icns similarity index 100% rename from extras/Demo/Builds/MacOSX/Icon.icns rename to examples/Demo/Builds/MacOSX/Icon.icns diff --git a/extras/Demo/Builds/MacOSX/Info.plist b/examples/Demo/Builds/MacOSX/Info.plist similarity index 100% rename from extras/Demo/Builds/MacOSX/Info.plist rename to examples/Demo/Builds/MacOSX/Info.plist diff --git a/extras/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj similarity index 100% rename from extras/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj rename to examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj diff --git a/extras/Demo/Builds/MacOSX/RecentFilesMenuTemplate.nib b/examples/Demo/Builds/MacOSX/RecentFilesMenuTemplate.nib similarity index 100% rename from extras/Demo/Builds/MacOSX/RecentFilesMenuTemplate.nib rename to examples/Demo/Builds/MacOSX/RecentFilesMenuTemplate.nib diff --git a/extras/Demo/Builds/VisualStudio2010/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2010/JuceDemo.sln similarity index 100% rename from extras/Demo/Builds/VisualStudio2010/JuceDemo.sln rename to examples/Demo/Builds/VisualStudio2010/JuceDemo.sln diff --git a/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj b/examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj similarity index 100% rename from extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj rename to examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj diff --git a/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters b/examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters similarity index 100% rename from extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters rename to examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters diff --git a/extras/Demo/Builds/VisualStudio2010/icon.ico b/examples/Demo/Builds/VisualStudio2010/icon.ico similarity index 100% rename from extras/Demo/Builds/VisualStudio2010/icon.ico rename to examples/Demo/Builds/VisualStudio2010/icon.ico diff --git a/extras/Demo/Builds/VisualStudio2010/resources.rc b/examples/Demo/Builds/VisualStudio2010/resources.rc similarity index 100% rename from extras/Demo/Builds/VisualStudio2010/resources.rc rename to examples/Demo/Builds/VisualStudio2010/resources.rc diff --git a/extras/Demo/Builds/VisualStudio2012/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2012/JuceDemo.sln similarity index 100% rename from extras/Demo/Builds/VisualStudio2012/JuceDemo.sln rename to examples/Demo/Builds/VisualStudio2012/JuceDemo.sln diff --git a/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj b/examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj similarity index 100% rename from extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj rename to examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj diff --git a/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters b/examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters similarity index 100% rename from extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters rename to examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters diff --git a/extras/Demo/Builds/VisualStudio2012/icon.ico b/examples/Demo/Builds/VisualStudio2012/icon.ico similarity index 100% rename from extras/Demo/Builds/VisualStudio2012/icon.ico rename to examples/Demo/Builds/VisualStudio2012/icon.ico diff --git a/extras/Demo/Builds/VisualStudio2012/resources.rc b/examples/Demo/Builds/VisualStudio2012/resources.rc similarity index 100% rename from extras/Demo/Builds/VisualStudio2012/resources.rc rename to examples/Demo/Builds/VisualStudio2012/resources.rc diff --git a/extras/Demo/Builds/VisualStudio2013/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln similarity index 100% rename from extras/Demo/Builds/VisualStudio2013/JuceDemo.sln rename to examples/Demo/Builds/VisualStudio2013/JuceDemo.sln diff --git a/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj similarity index 100% rename from extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj rename to examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj diff --git a/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters b/examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters similarity index 100% rename from extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters rename to examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters diff --git a/extras/Demo/Builds/VisualStudio2013/icon.ico b/examples/Demo/Builds/VisualStudio2013/icon.ico similarity index 100% rename from extras/Demo/Builds/VisualStudio2013/icon.ico rename to examples/Demo/Builds/VisualStudio2013/icon.ico diff --git a/extras/Demo/Builds/VisualStudio2013/resources.rc b/examples/Demo/Builds/VisualStudio2013/resources.rc similarity index 100% rename from extras/Demo/Builds/VisualStudio2013/resources.rc rename to examples/Demo/Builds/VisualStudio2013/resources.rc diff --git a/extras/Demo/Builds/iOS/Icon.icns b/examples/Demo/Builds/iOS/Icon.icns similarity index 100% rename from extras/Demo/Builds/iOS/Icon.icns rename to examples/Demo/Builds/iOS/Icon.icns diff --git a/extras/Demo/Builds/iOS/Info.plist b/examples/Demo/Builds/iOS/Info.plist similarity index 100% rename from extras/Demo/Builds/iOS/Info.plist rename to examples/Demo/Builds/iOS/Info.plist diff --git a/extras/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj similarity index 100% rename from extras/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj rename to examples/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj diff --git a/extras/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from extras/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json rename to examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/extras/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from extras/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json rename to examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/extras/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer similarity index 100% rename from extras/Demo/JuceDemo.jucer rename to examples/Demo/JuceDemo.jucer diff --git a/extras/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h similarity index 100% rename from extras/Demo/JuceLibraryCode/AppConfig.h rename to examples/Demo/JuceLibraryCode/AppConfig.h diff --git a/extras/Demo/JuceLibraryCode/BinaryData.cpp b/examples/Demo/JuceLibraryCode/BinaryData.cpp similarity index 100% rename from extras/Demo/JuceLibraryCode/BinaryData.cpp rename to examples/Demo/JuceLibraryCode/BinaryData.cpp diff --git a/extras/Demo/JuceLibraryCode/BinaryData.h b/examples/Demo/JuceLibraryCode/BinaryData.h similarity index 100% rename from extras/Demo/JuceLibraryCode/BinaryData.h rename to examples/Demo/JuceLibraryCode/BinaryData.h diff --git a/extras/Demo/JuceLibraryCode/JuceHeader.h b/examples/Demo/JuceLibraryCode/JuceHeader.h similarity index 100% rename from extras/Demo/JuceLibraryCode/JuceHeader.h rename to examples/Demo/JuceLibraryCode/JuceHeader.h diff --git a/extras/Demo/JuceLibraryCode/ReadMe.txt b/examples/Demo/JuceLibraryCode/ReadMe.txt similarity index 100% rename from extras/Demo/JuceLibraryCode/ReadMe.txt rename to examples/Demo/JuceLibraryCode/ReadMe.txt diff --git a/extras/Demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h b/examples/Demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h rename to examples/Demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h b/examples/Demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h rename to examples/Demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h b/examples/Demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h rename to examples/Demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h b/examples/Demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h rename to examples/Demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h b/examples/Demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h rename to examples/Demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_box2d/juce_box2d.h b/examples/Demo/JuceLibraryCode/modules/juce_box2d/juce_box2d.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_box2d/juce_box2d.h rename to examples/Demo/JuceLibraryCode/modules/juce_box2d/juce_box2d.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_core/juce_core.h b/examples/Demo/JuceLibraryCode/modules/juce_core/juce_core.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_core/juce_core.h rename to examples/Demo/JuceLibraryCode/modules/juce_core/juce_core.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h b/examples/Demo/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h rename to examples/Demo/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h b/examples/Demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h rename to examples/Demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_events/juce_events.h b/examples/Demo/JuceLibraryCode/modules/juce_events/juce_events.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_events/juce_events.h rename to examples/Demo/JuceLibraryCode/modules/juce_events/juce_events.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h b/examples/Demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h rename to examples/Demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h b/examples/Demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h rename to examples/Demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h b/examples/Demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h rename to examples/Demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_opengl/juce_opengl.h b/examples/Demo/JuceLibraryCode/modules/juce_opengl/juce_opengl.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_opengl/juce_opengl.h rename to examples/Demo/JuceLibraryCode/modules/juce_opengl/juce_opengl.h diff --git a/extras/Demo/JuceLibraryCode/modules/juce_video/juce_video.h b/examples/Demo/JuceLibraryCode/modules/juce_video/juce_video.h similarity index 100% rename from extras/Demo/JuceLibraryCode/modules/juce_video/juce_video.h rename to examples/Demo/JuceLibraryCode/modules/juce_video/juce_video.h diff --git a/extras/Demo/Resources/cello.wav b/examples/Demo/Resources/cello.wav similarity index 100% rename from extras/Demo/Resources/cello.wav rename to examples/Demo/Resources/cello.wav diff --git a/extras/Demo/Resources/demo table data.xml b/examples/Demo/Resources/demo table data.xml similarity index 100% rename from extras/Demo/Resources/demo table data.xml rename to examples/Demo/Resources/demo table data.xml diff --git a/extras/Demo/Resources/icons.zip b/examples/Demo/Resources/icons.zip similarity index 100% rename from extras/Demo/Resources/icons.zip rename to examples/Demo/Resources/icons.zip diff --git a/extras/Demo/Resources/juce_icon.png b/examples/Demo/Resources/juce_icon.png similarity index 100% rename from extras/Demo/Resources/juce_icon.png rename to examples/Demo/Resources/juce_icon.png diff --git a/extras/Demo/Resources/juce_module_info b/examples/Demo/Resources/juce_module_info similarity index 100% rename from extras/Demo/Resources/juce_module_info rename to examples/Demo/Resources/juce_module_info diff --git a/extras/Demo/Resources/portmeirion.jpg b/examples/Demo/Resources/portmeirion.jpg similarity index 100% rename from extras/Demo/Resources/portmeirion.jpg rename to examples/Demo/Resources/portmeirion.jpg diff --git a/extras/Demo/Resources/teapot.obj b/examples/Demo/Resources/teapot.obj similarity index 100% rename from extras/Demo/Resources/teapot.obj rename to examples/Demo/Resources/teapot.obj diff --git a/extras/Demo/Resources/tile_background.png b/examples/Demo/Resources/tile_background.png similarity index 100% rename from extras/Demo/Resources/tile_background.png rename to examples/Demo/Resources/tile_background.png diff --git a/extras/Demo/Resources/treedemo.xml b/examples/Demo/Resources/treedemo.xml similarity index 100% rename from extras/Demo/Resources/treedemo.xml rename to examples/Demo/Resources/treedemo.xml diff --git a/extras/Demo/Source/DemoUtilities.h b/examples/Demo/Source/DemoUtilities.h similarity index 100% rename from extras/Demo/Source/DemoUtilities.h rename to examples/Demo/Source/DemoUtilities.h diff --git a/extras/Demo/Source/Demos/AnimationDemo.cpp b/examples/Demo/Source/Demos/AnimationDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/AnimationDemo.cpp rename to examples/Demo/Source/Demos/AnimationDemo.cpp diff --git a/extras/Demo/Source/Demos/AudioLatencyDemo.cpp b/examples/Demo/Source/Demos/AudioLatencyDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/AudioLatencyDemo.cpp rename to examples/Demo/Source/Demos/AudioLatencyDemo.cpp diff --git a/extras/Demo/Source/Demos/AudioLiveScrollingDisplay.h b/examples/Demo/Source/Demos/AudioLiveScrollingDisplay.h similarity index 100% rename from extras/Demo/Source/Demos/AudioLiveScrollingDisplay.h rename to examples/Demo/Source/Demos/AudioLiveScrollingDisplay.h diff --git a/extras/Demo/Source/Demos/AudioPlaybackDemo.cpp b/examples/Demo/Source/Demos/AudioPlaybackDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/AudioPlaybackDemo.cpp rename to examples/Demo/Source/Demos/AudioPlaybackDemo.cpp diff --git a/extras/Demo/Source/Demos/AudioRecordingDemo.cpp b/examples/Demo/Source/Demos/AudioRecordingDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/AudioRecordingDemo.cpp rename to examples/Demo/Source/Demos/AudioRecordingDemo.cpp diff --git a/extras/Demo/Source/Demos/AudioSettingsDemo.cpp b/examples/Demo/Source/Demos/AudioSettingsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/AudioSettingsDemo.cpp rename to examples/Demo/Source/Demos/AudioSettingsDemo.cpp diff --git a/extras/Demo/Source/Demos/AudioSynthesiserDemo.cpp b/examples/Demo/Source/Demos/AudioSynthesiserDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/AudioSynthesiserDemo.cpp rename to examples/Demo/Source/Demos/AudioSynthesiserDemo.cpp diff --git a/extras/Demo/Source/Demos/Box2DDemo.cpp b/examples/Demo/Source/Demos/Box2DDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/Box2DDemo.cpp rename to examples/Demo/Source/Demos/Box2DDemo.cpp diff --git a/extras/Demo/Source/Demos/Box2DTests/AddPair.h b/examples/Demo/Source/Demos/Box2DTests/AddPair.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/AddPair.h rename to examples/Demo/Source/Demos/Box2DTests/AddPair.h diff --git a/extras/Demo/Source/Demos/Box2DTests/ApplyForce.h b/examples/Demo/Source/Demos/Box2DTests/ApplyForce.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/ApplyForce.h rename to examples/Demo/Source/Demos/Box2DTests/ApplyForce.h diff --git a/extras/Demo/Source/Demos/Box2DTests/BodyTypes.h b/examples/Demo/Source/Demos/Box2DTests/BodyTypes.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/BodyTypes.h rename to examples/Demo/Source/Demos/Box2DTests/BodyTypes.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Breakable.h b/examples/Demo/Source/Demos/Box2DTests/Breakable.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Breakable.h rename to examples/Demo/Source/Demos/Box2DTests/Breakable.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Bridge.h b/examples/Demo/Source/Demos/Box2DTests/Bridge.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Bridge.h rename to examples/Demo/Source/Demos/Box2DTests/Bridge.h diff --git a/extras/Demo/Source/Demos/Box2DTests/BulletTest.h b/examples/Demo/Source/Demos/Box2DTests/BulletTest.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/BulletTest.h rename to examples/Demo/Source/Demos/Box2DTests/BulletTest.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Cantilever.h b/examples/Demo/Source/Demos/Box2DTests/Cantilever.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Cantilever.h rename to examples/Demo/Source/Demos/Box2DTests/Cantilever.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Car.h b/examples/Demo/Source/Demos/Box2DTests/Car.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Car.h rename to examples/Demo/Source/Demos/Box2DTests/Car.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Chain.h b/examples/Demo/Source/Demos/Box2DTests/Chain.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Chain.h rename to examples/Demo/Source/Demos/Box2DTests/Chain.h diff --git a/extras/Demo/Source/Demos/Box2DTests/CharacterCollision.h b/examples/Demo/Source/Demos/Box2DTests/CharacterCollision.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/CharacterCollision.h rename to examples/Demo/Source/Demos/Box2DTests/CharacterCollision.h diff --git a/extras/Demo/Source/Demos/Box2DTests/CollisionFiltering.h b/examples/Demo/Source/Demos/Box2DTests/CollisionFiltering.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/CollisionFiltering.h rename to examples/Demo/Source/Demos/Box2DTests/CollisionFiltering.h diff --git a/extras/Demo/Source/Demos/Box2DTests/CollisionProcessing.h b/examples/Demo/Source/Demos/Box2DTests/CollisionProcessing.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/CollisionProcessing.h rename to examples/Demo/Source/Demos/Box2DTests/CollisionProcessing.h diff --git a/extras/Demo/Source/Demos/Box2DTests/CompoundShapes.h b/examples/Demo/Source/Demos/Box2DTests/CompoundShapes.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/CompoundShapes.h rename to examples/Demo/Source/Demos/Box2DTests/CompoundShapes.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Confined.h b/examples/Demo/Source/Demos/Box2DTests/Confined.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Confined.h rename to examples/Demo/Source/Demos/Box2DTests/Confined.h diff --git a/extras/Demo/Source/Demos/Box2DTests/ContinuousTest.h b/examples/Demo/Source/Demos/Box2DTests/ContinuousTest.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/ContinuousTest.h rename to examples/Demo/Source/Demos/Box2DTests/ContinuousTest.h diff --git a/extras/Demo/Source/Demos/Box2DTests/DistanceTest.h b/examples/Demo/Source/Demos/Box2DTests/DistanceTest.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/DistanceTest.h rename to examples/Demo/Source/Demos/Box2DTests/DistanceTest.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Dominos.h b/examples/Demo/Source/Demos/Box2DTests/Dominos.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Dominos.h rename to examples/Demo/Source/Demos/Box2DTests/Dominos.h diff --git a/extras/Demo/Source/Demos/Box2DTests/DumpShell.h b/examples/Demo/Source/Demos/Box2DTests/DumpShell.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/DumpShell.h rename to examples/Demo/Source/Demos/Box2DTests/DumpShell.h diff --git a/extras/Demo/Source/Demos/Box2DTests/DynamicTreeTest.h b/examples/Demo/Source/Demos/Box2DTests/DynamicTreeTest.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/DynamicTreeTest.h rename to examples/Demo/Source/Demos/Box2DTests/DynamicTreeTest.h diff --git a/extras/Demo/Source/Demos/Box2DTests/EdgeShapes.h b/examples/Demo/Source/Demos/Box2DTests/EdgeShapes.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/EdgeShapes.h rename to examples/Demo/Source/Demos/Box2DTests/EdgeShapes.h diff --git a/extras/Demo/Source/Demos/Box2DTests/EdgeTest.h b/examples/Demo/Source/Demos/Box2DTests/EdgeTest.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/EdgeTest.h rename to examples/Demo/Source/Demos/Box2DTests/EdgeTest.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Gears.h b/examples/Demo/Source/Demos/Box2DTests/Gears.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Gears.h rename to examples/Demo/Source/Demos/Box2DTests/Gears.h diff --git a/extras/Demo/Source/Demos/Box2DTests/OneSidedPlatform.h b/examples/Demo/Source/Demos/Box2DTests/OneSidedPlatform.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/OneSidedPlatform.h rename to examples/Demo/Source/Demos/Box2DTests/OneSidedPlatform.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Pinball.h b/examples/Demo/Source/Demos/Box2DTests/Pinball.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Pinball.h rename to examples/Demo/Source/Demos/Box2DTests/Pinball.h diff --git a/extras/Demo/Source/Demos/Box2DTests/PolyCollision.h b/examples/Demo/Source/Demos/Box2DTests/PolyCollision.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/PolyCollision.h rename to examples/Demo/Source/Demos/Box2DTests/PolyCollision.h diff --git a/extras/Demo/Source/Demos/Box2DTests/PolyShapes.h b/examples/Demo/Source/Demos/Box2DTests/PolyShapes.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/PolyShapes.h rename to examples/Demo/Source/Demos/Box2DTests/PolyShapes.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Prismatic.h b/examples/Demo/Source/Demos/Box2DTests/Prismatic.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Prismatic.h rename to examples/Demo/Source/Demos/Box2DTests/Prismatic.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Pulleys.h b/examples/Demo/Source/Demos/Box2DTests/Pulleys.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Pulleys.h rename to examples/Demo/Source/Demos/Box2DTests/Pulleys.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Pyramid.h b/examples/Demo/Source/Demos/Box2DTests/Pyramid.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Pyramid.h rename to examples/Demo/Source/Demos/Box2DTests/Pyramid.h diff --git a/extras/Demo/Source/Demos/Box2DTests/RayCast.h b/examples/Demo/Source/Demos/Box2DTests/RayCast.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/RayCast.h rename to examples/Demo/Source/Demos/Box2DTests/RayCast.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Revolute.h b/examples/Demo/Source/Demos/Box2DTests/Revolute.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Revolute.h rename to examples/Demo/Source/Demos/Box2DTests/Revolute.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Rope.h b/examples/Demo/Source/Demos/Box2DTests/Rope.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Rope.h rename to examples/Demo/Source/Demos/Box2DTests/Rope.h diff --git a/extras/Demo/Source/Demos/Box2DTests/RopeJoint.h b/examples/Demo/Source/Demos/Box2DTests/RopeJoint.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/RopeJoint.h rename to examples/Demo/Source/Demos/Box2DTests/RopeJoint.h diff --git a/extras/Demo/Source/Demos/Box2DTests/SensorTest.h b/examples/Demo/Source/Demos/Box2DTests/SensorTest.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/SensorTest.h rename to examples/Demo/Source/Demos/Box2DTests/SensorTest.h diff --git a/extras/Demo/Source/Demos/Box2DTests/ShapeEditing.h b/examples/Demo/Source/Demos/Box2DTests/ShapeEditing.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/ShapeEditing.h rename to examples/Demo/Source/Demos/Box2DTests/ShapeEditing.h diff --git a/extras/Demo/Source/Demos/Box2DTests/SliderCrank.h b/examples/Demo/Source/Demos/Box2DTests/SliderCrank.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/SliderCrank.h rename to examples/Demo/Source/Demos/Box2DTests/SliderCrank.h diff --git a/extras/Demo/Source/Demos/Box2DTests/SphereStack.h b/examples/Demo/Source/Demos/Box2DTests/SphereStack.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/SphereStack.h rename to examples/Demo/Source/Demos/Box2DTests/SphereStack.h diff --git a/extras/Demo/Source/Demos/Box2DTests/TestEntries.cpp b/examples/Demo/Source/Demos/Box2DTests/TestEntries.cpp similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/TestEntries.cpp rename to examples/Demo/Source/Demos/Box2DTests/TestEntries.cpp diff --git a/extras/Demo/Source/Demos/Box2DTests/TheoJansen.h b/examples/Demo/Source/Demos/Box2DTests/TheoJansen.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/TheoJansen.h rename to examples/Demo/Source/Demos/Box2DTests/TheoJansen.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Tiles.h b/examples/Demo/Source/Demos/Box2DTests/Tiles.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Tiles.h rename to examples/Demo/Source/Demos/Box2DTests/Tiles.h diff --git a/extras/Demo/Source/Demos/Box2DTests/TimeOfImpact.h b/examples/Demo/Source/Demos/Box2DTests/TimeOfImpact.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/TimeOfImpact.h rename to examples/Demo/Source/Demos/Box2DTests/TimeOfImpact.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Tumbler.h b/examples/Demo/Source/Demos/Box2DTests/Tumbler.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Tumbler.h rename to examples/Demo/Source/Demos/Box2DTests/Tumbler.h diff --git a/extras/Demo/Source/Demos/Box2DTests/VaryingFriction.h b/examples/Demo/Source/Demos/Box2DTests/VaryingFriction.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/VaryingFriction.h rename to examples/Demo/Source/Demos/Box2DTests/VaryingFriction.h diff --git a/extras/Demo/Source/Demos/Box2DTests/VaryingRestitution.h b/examples/Demo/Source/Demos/Box2DTests/VaryingRestitution.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/VaryingRestitution.h rename to examples/Demo/Source/Demos/Box2DTests/VaryingRestitution.h diff --git a/extras/Demo/Source/Demos/Box2DTests/VerticalStack.h b/examples/Demo/Source/Demos/Box2DTests/VerticalStack.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/VerticalStack.h rename to examples/Demo/Source/Demos/Box2DTests/VerticalStack.h diff --git a/extras/Demo/Source/Demos/Box2DTests/Web.h b/examples/Demo/Source/Demos/Box2DTests/Web.h similarity index 100% rename from extras/Demo/Source/Demos/Box2DTests/Web.h rename to examples/Demo/Source/Demos/Box2DTests/Web.h diff --git a/extras/Demo/Source/Demos/CameraDemo.cpp b/examples/Demo/Source/Demos/CameraDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/CameraDemo.cpp rename to examples/Demo/Source/Demos/CameraDemo.cpp diff --git a/extras/Demo/Source/Demos/ChildProcessDemo.cpp b/examples/Demo/Source/Demos/ChildProcessDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/ChildProcessDemo.cpp rename to examples/Demo/Source/Demos/ChildProcessDemo.cpp diff --git a/extras/Demo/Source/Demos/CodeEditorDemo.cpp b/examples/Demo/Source/Demos/CodeEditorDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/CodeEditorDemo.cpp rename to examples/Demo/Source/Demos/CodeEditorDemo.cpp diff --git a/extras/Demo/Source/Demos/ComponentTransformsDemo.cpp b/examples/Demo/Source/Demos/ComponentTransformsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/ComponentTransformsDemo.cpp rename to examples/Demo/Source/Demos/ComponentTransformsDemo.cpp diff --git a/extras/Demo/Source/Demos/CryptographyDemo.cpp b/examples/Demo/Source/Demos/CryptographyDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/CryptographyDemo.cpp rename to examples/Demo/Source/Demos/CryptographyDemo.cpp diff --git a/extras/Demo/Source/Demos/DialogsDemo.cpp b/examples/Demo/Source/Demos/DialogsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/DialogsDemo.cpp rename to examples/Demo/Source/Demos/DialogsDemo.cpp diff --git a/extras/Demo/Source/Demos/FontsDemo.cpp b/examples/Demo/Source/Demos/FontsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/FontsDemo.cpp rename to examples/Demo/Source/Demos/FontsDemo.cpp diff --git a/extras/Demo/Source/Demos/GraphicsDemo.cpp b/examples/Demo/Source/Demos/GraphicsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/GraphicsDemo.cpp rename to examples/Demo/Source/Demos/GraphicsDemo.cpp diff --git a/extras/Demo/Source/Demos/ImagesDemo.cpp b/examples/Demo/Source/Demos/ImagesDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/ImagesDemo.cpp rename to examples/Demo/Source/Demos/ImagesDemo.cpp diff --git a/extras/Demo/Source/Demos/JavaScript.cpp b/examples/Demo/Source/Demos/JavaScript.cpp similarity index 100% rename from extras/Demo/Source/Demos/JavaScript.cpp rename to examples/Demo/Source/Demos/JavaScript.cpp diff --git a/extras/Demo/Source/Demos/KeyMappingsDemo.cpp b/examples/Demo/Source/Demos/KeyMappingsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/KeyMappingsDemo.cpp rename to examples/Demo/Source/Demos/KeyMappingsDemo.cpp diff --git a/extras/Demo/Source/Demos/LiveConstantDemo.cpp b/examples/Demo/Source/Demos/LiveConstantDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/LiveConstantDemo.cpp rename to examples/Demo/Source/Demos/LiveConstantDemo.cpp diff --git a/extras/Demo/Source/Demos/LookAndFeelDemo.cpp b/examples/Demo/Source/Demos/LookAndFeelDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/LookAndFeelDemo.cpp rename to examples/Demo/Source/Demos/LookAndFeelDemo.cpp diff --git a/extras/Demo/Source/Demos/MDIDemo.cpp b/examples/Demo/Source/Demos/MDIDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/MDIDemo.cpp rename to examples/Demo/Source/Demos/MDIDemo.cpp diff --git a/extras/Demo/Source/Demos/MidiDemo.cpp b/examples/Demo/Source/Demos/MidiDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/MidiDemo.cpp rename to examples/Demo/Source/Demos/MidiDemo.cpp diff --git a/extras/Demo/Source/Demos/MultiTouch.cpp b/examples/Demo/Source/Demos/MultiTouch.cpp similarity index 100% rename from extras/Demo/Source/Demos/MultiTouch.cpp rename to examples/Demo/Source/Demos/MultiTouch.cpp diff --git a/extras/Demo/Source/Demos/MultithreadingDemo.cpp b/examples/Demo/Source/Demos/MultithreadingDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/MultithreadingDemo.cpp rename to examples/Demo/Source/Demos/MultithreadingDemo.cpp diff --git a/extras/Demo/Source/Demos/NetworkingDemo.cpp b/examples/Demo/Source/Demos/NetworkingDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/NetworkingDemo.cpp rename to examples/Demo/Source/Demos/NetworkingDemo.cpp diff --git a/extras/Demo/Source/Demos/OpenGLDemo.cpp b/examples/Demo/Source/Demos/OpenGLDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/OpenGLDemo.cpp rename to examples/Demo/Source/Demos/OpenGLDemo.cpp diff --git a/extras/Demo/Source/Demos/OpenGLDemo2D.cpp b/examples/Demo/Source/Demos/OpenGLDemo2D.cpp similarity index 100% rename from extras/Demo/Source/Demos/OpenGLDemo2D.cpp rename to examples/Demo/Source/Demos/OpenGLDemo2D.cpp diff --git a/extras/Demo/Source/Demos/PropertiesDemo.cpp b/examples/Demo/Source/Demos/PropertiesDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/PropertiesDemo.cpp rename to examples/Demo/Source/Demos/PropertiesDemo.cpp diff --git a/extras/Demo/Source/Demos/SystemInfoDemo.cpp b/examples/Demo/Source/Demos/SystemInfoDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/SystemInfoDemo.cpp rename to examples/Demo/Source/Demos/SystemInfoDemo.cpp diff --git a/extras/Demo/Source/Demos/TimersAndEventsDemo.cpp b/examples/Demo/Source/Demos/TimersAndEventsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/TimersAndEventsDemo.cpp rename to examples/Demo/Source/Demos/TimersAndEventsDemo.cpp diff --git a/extras/Demo/Source/Demos/UnitTestsDemo.cpp b/examples/Demo/Source/Demos/UnitTestsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/UnitTestsDemo.cpp rename to examples/Demo/Source/Demos/UnitTestsDemo.cpp diff --git a/extras/Demo/Source/Demos/ValueTreesDemo.cpp b/examples/Demo/Source/Demos/ValueTreesDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/ValueTreesDemo.cpp rename to examples/Demo/Source/Demos/ValueTreesDemo.cpp diff --git a/extras/Demo/Source/Demos/VideoDemo.cpp b/examples/Demo/Source/Demos/VideoDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/VideoDemo.cpp rename to examples/Demo/Source/Demos/VideoDemo.cpp diff --git a/extras/Demo/Source/Demos/WavefrontObjParser.h b/examples/Demo/Source/Demos/WavefrontObjParser.h similarity index 100% rename from extras/Demo/Source/Demos/WavefrontObjParser.h rename to examples/Demo/Source/Demos/WavefrontObjParser.h diff --git a/extras/Demo/Source/Demos/WebBrowserDemo.cpp b/examples/Demo/Source/Demos/WebBrowserDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/WebBrowserDemo.cpp rename to examples/Demo/Source/Demos/WebBrowserDemo.cpp diff --git a/extras/Demo/Source/Demos/WidgetsDemo.cpp b/examples/Demo/Source/Demos/WidgetsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/WidgetsDemo.cpp rename to examples/Demo/Source/Demos/WidgetsDemo.cpp diff --git a/extras/Demo/Source/Demos/WindowsDemo.cpp b/examples/Demo/Source/Demos/WindowsDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/WindowsDemo.cpp rename to examples/Demo/Source/Demos/WindowsDemo.cpp diff --git a/extras/Demo/Source/Demos/XMLandJSONDemo.cpp b/examples/Demo/Source/Demos/XMLandJSONDemo.cpp similarity index 100% rename from extras/Demo/Source/Demos/XMLandJSONDemo.cpp rename to examples/Demo/Source/Demos/XMLandJSONDemo.cpp diff --git a/extras/Demo/Source/IntroScreen.cpp b/examples/Demo/Source/IntroScreen.cpp similarity index 100% rename from extras/Demo/Source/IntroScreen.cpp rename to examples/Demo/Source/IntroScreen.cpp diff --git a/extras/Demo/Source/JuceDemoHeader.h b/examples/Demo/Source/JuceDemoHeader.h similarity index 100% rename from extras/Demo/Source/JuceDemoHeader.h rename to examples/Demo/Source/JuceDemoHeader.h diff --git a/extras/Demo/Source/Main.cpp b/examples/Demo/Source/Main.cpp similarity index 100% rename from extras/Demo/Source/Main.cpp rename to examples/Demo/Source/Main.cpp diff --git a/extras/Demo/Source/MainWindow.cpp b/examples/Demo/Source/MainWindow.cpp similarity index 100% rename from extras/Demo/Source/MainWindow.cpp rename to examples/Demo/Source/MainWindow.cpp diff --git a/extras/Demo/Source/MainWindow.h b/examples/Demo/Source/MainWindow.h similarity index 100% rename from extras/Demo/Source/MainWindow.h rename to examples/Demo/Source/MainWindow.h diff --git a/extras/example projects/Builds/Linux/Makefile b/examples/HelloWorld/Builds/Linux/Makefile similarity index 100% rename from extras/example projects/Builds/Linux/Makefile rename to examples/HelloWorld/Builds/Linux/Makefile diff --git a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj similarity index 100% rename from extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj rename to examples/HelloWorld/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj diff --git a/extras/example projects/Builds/MacOSX/Info.plist b/examples/HelloWorld/Builds/MacOSX/Info.plist similarity index 100% rename from extras/example projects/Builds/MacOSX/Info.plist rename to examples/HelloWorld/Builds/MacOSX/Info.plist diff --git a/extras/audio plugin demo/Builds/MacOSX/RecentFilesMenuTemplate.nib b/examples/HelloWorld/Builds/MacOSX/RecentFilesMenuTemplate.nib similarity index 100% rename from extras/audio plugin demo/Builds/MacOSX/RecentFilesMenuTemplate.nib rename to examples/HelloWorld/Builds/MacOSX/RecentFilesMenuTemplate.nib diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.sln similarity index 100% rename from extras/example projects/Builds/VisualStudio2005/HelloWorld.sln rename to examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.sln diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj similarity index 100% rename from extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj rename to examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj diff --git a/extras/example projects/Builds/VisualStudio2005/resources.rc b/examples/HelloWorld/Builds/VisualStudio2005/resources.rc similarity index 100% rename from extras/example projects/Builds/VisualStudio2005/resources.rc rename to examples/HelloWorld/Builds/VisualStudio2005/resources.rc diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2008/HelloWorld.sln similarity index 100% rename from extras/example projects/Builds/VisualStudio2008/HelloWorld.sln rename to examples/HelloWorld/Builds/VisualStudio2008/HelloWorld.sln diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj b/examples/HelloWorld/Builds/VisualStudio2008/HelloWorld.vcproj similarity index 100% rename from extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj rename to examples/HelloWorld/Builds/VisualStudio2008/HelloWorld.vcproj diff --git a/extras/example projects/Builds/VisualStudio2008/resources.rc b/examples/HelloWorld/Builds/VisualStudio2008/resources.rc similarity index 100% rename from extras/example projects/Builds/VisualStudio2008/resources.rc rename to examples/HelloWorld/Builds/VisualStudio2008/resources.rc diff --git a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj similarity index 100% rename from extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj rename to examples/HelloWorld/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj diff --git a/extras/example projects/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from extras/example projects/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json rename to examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/extras/example projects/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from extras/example projects/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json rename to examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/extras/example projects/Builds/iOS/Info.plist b/examples/HelloWorld/Builds/iOS/Info.plist similarity index 100% rename from extras/example projects/Builds/iOS/Info.plist rename to examples/HelloWorld/Builds/iOS/Info.plist diff --git a/extras/example projects/HelloWorld.jucer b/examples/HelloWorld/HelloWorld.jucer similarity index 100% rename from extras/example projects/HelloWorld.jucer rename to examples/HelloWorld/HelloWorld.jucer diff --git a/extras/example projects/JuceLibraryCode/AppConfig.h b/examples/HelloWorld/JuceLibraryCode/AppConfig.h similarity index 100% rename from extras/example projects/JuceLibraryCode/AppConfig.h rename to examples/HelloWorld/JuceLibraryCode/AppConfig.h diff --git a/extras/example projects/JuceLibraryCode/JuceHeader.h b/examples/HelloWorld/JuceLibraryCode/JuceHeader.h similarity index 100% rename from extras/example projects/JuceLibraryCode/JuceHeader.h rename to examples/HelloWorld/JuceLibraryCode/JuceHeader.h diff --git a/extras/audio plugin demo/JuceLibraryCode/ReadMe.txt b/examples/HelloWorld/JuceLibraryCode/ReadMe.txt similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/ReadMe.txt rename to examples/HelloWorld/JuceLibraryCode/ReadMe.txt diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_core/juce_core.h b/examples/HelloWorld/JuceLibraryCode/modules/juce_core/juce_core.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_core/juce_core.h rename to examples/HelloWorld/JuceLibraryCode/modules/juce_core/juce_core.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h b/examples/HelloWorld/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h rename to examples/HelloWorld/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_events/juce_events.h b/examples/HelloWorld/JuceLibraryCode/modules/juce_events/juce_events.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_events/juce_events.h rename to examples/HelloWorld/JuceLibraryCode/modules/juce_events/juce_events.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h b/examples/HelloWorld/JuceLibraryCode/modules/juce_graphics/juce_graphics.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h rename to examples/HelloWorld/JuceLibraryCode/modules/juce_graphics/juce_graphics.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h b/examples/HelloWorld/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h rename to examples/HelloWorld/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h b/examples/HelloWorld/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h rename to examples/HelloWorld/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h diff --git a/extras/example projects/Source/Main.cpp b/examples/HelloWorld/Source/Main.cpp similarity index 100% rename from extras/example projects/Source/Main.cpp rename to examples/HelloWorld/Source/Main.cpp diff --git a/extras/example projects/Source/MainComponent.cpp b/examples/HelloWorld/Source/MainComponent.cpp similarity index 100% rename from extras/example projects/Source/MainComponent.cpp rename to examples/HelloWorld/Source/MainComponent.cpp diff --git a/extras/example projects/Source/MainComponent.h b/examples/HelloWorld/Source/MainComponent.h similarity index 100% rename from extras/example projects/Source/MainComponent.h rename to examples/HelloWorld/Source/MainComponent.h diff --git a/extras/example projects/readme.txt b/examples/HelloWorld/readme.txt similarity index 100% rename from extras/example projects/readme.txt rename to examples/HelloWorld/readme.txt diff --git a/extras/audio plugin demo/Builds/Linux/Makefile b/examples/audio plugin demo/Builds/Linux/Makefile similarity index 100% rename from extras/audio plugin demo/Builds/Linux/Makefile rename to examples/audio plugin demo/Builds/Linux/Makefile diff --git a/extras/audio plugin demo/Builds/MacOSX/Info.plist b/examples/audio plugin demo/Builds/MacOSX/Info.plist similarity index 100% rename from extras/audio plugin demo/Builds/MacOSX/Info.plist rename to examples/audio plugin demo/Builds/MacOSX/Info.plist diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj similarity index 100% rename from extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj rename to examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj diff --git a/extras/audio plugin host/Builds/MacOSX/RecentFilesMenuTemplate.nib b/examples/audio plugin demo/Builds/MacOSX/RecentFilesMenuTemplate.nib similarity index 100% rename from extras/audio plugin host/Builds/MacOSX/RecentFilesMenuTemplate.nib rename to examples/audio plugin demo/Builds/MacOSX/RecentFilesMenuTemplate.nib diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.sln similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.sln rename to examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.sln diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj rename to examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/resources.rc b/examples/audio plugin demo/Builds/VisualStudio2005/resources.rc similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2005/resources.rc rename to examples/audio plugin demo/Builds/VisualStudio2005/resources.rc diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.sln similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.sln rename to examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.sln diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj b/examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj rename to examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj rename to examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj.filters b/examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj.filters similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj.filters rename to examples/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcxproj.filters diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/resources.rc b/examples/audio plugin demo/Builds/VisualStudio2008/resources.rc similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2008/resources.rc rename to examples/audio plugin demo/Builds/VisualStudio2008/resources.rc diff --git a/extras/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.sln similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.sln rename to examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.sln diff --git a/extras/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj rename to examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj diff --git a/extras/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj.filters b/examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj.filters similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj.filters rename to examples/audio plugin demo/Builds/VisualStudio2010/JuceDemoPlugin.vcxproj.filters diff --git a/extras/audio plugin demo/Builds/VisualStudio2010/resources.rc b/examples/audio plugin demo/Builds/VisualStudio2010/resources.rc similarity index 100% rename from extras/audio plugin demo/Builds/VisualStudio2010/resources.rc rename to examples/audio plugin demo/Builds/VisualStudio2010/resources.rc diff --git a/extras/audio plugin demo/How to use this framework.txt b/examples/audio plugin demo/How to use this framework.txt similarity index 100% rename from extras/audio plugin demo/How to use this framework.txt rename to examples/audio plugin demo/How to use this framework.txt diff --git a/extras/audio plugin demo/JuceDemoPlugin.jucer b/examples/audio plugin demo/JuceDemoPlugin.jucer similarity index 100% rename from extras/audio plugin demo/JuceDemoPlugin.jucer rename to examples/audio plugin demo/JuceDemoPlugin.jucer diff --git a/extras/audio plugin demo/JuceLibraryCode/AppConfig.h b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/AppConfig.h rename to examples/audio plugin demo/JuceLibraryCode/AppConfig.h diff --git a/extras/audio plugin demo/JuceLibraryCode/JuceHeader.h b/examples/audio plugin demo/JuceLibraryCode/JuceHeader.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/JuceHeader.h rename to examples/audio plugin demo/JuceLibraryCode/JuceHeader.h diff --git a/extras/audio plugin host/JuceLibraryCode/ReadMe.txt b/examples/audio plugin demo/JuceLibraryCode/ReadMe.txt similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/ReadMe.txt rename to examples/audio plugin demo/JuceLibraryCode/ReadMe.txt diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_plugin_client/juce_audio_plugin_client.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_plugin_client/juce_audio_plugin_client.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_plugin_client/juce_audio_plugin_client.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_plugin_client/juce_audio_plugin_client.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h diff --git a/extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h similarity index 100% rename from extras/audio plugin demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_core/juce_core.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_core/juce_core.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_core/juce_core.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_core/juce_core.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_events/juce_events.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_events/juce_events.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_events/juce_events.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_events/juce_events.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_graphics/juce_graphics.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_graphics/juce_graphics.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_graphics/juce_graphics.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h b/examples/audio plugin demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h rename to examples/audio plugin demo/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h diff --git a/extras/audio plugin demo/Source/PluginEditor.cpp b/examples/audio plugin demo/Source/PluginEditor.cpp similarity index 100% rename from extras/audio plugin demo/Source/PluginEditor.cpp rename to examples/audio plugin demo/Source/PluginEditor.cpp diff --git a/extras/audio plugin demo/Source/PluginEditor.h b/examples/audio plugin demo/Source/PluginEditor.h similarity index 100% rename from extras/audio plugin demo/Source/PluginEditor.h rename to examples/audio plugin demo/Source/PluginEditor.h diff --git a/extras/audio plugin demo/Source/PluginProcessor.cpp b/examples/audio plugin demo/Source/PluginProcessor.cpp similarity index 100% rename from extras/audio plugin demo/Source/PluginProcessor.cpp rename to examples/audio plugin demo/Source/PluginProcessor.cpp diff --git a/extras/audio plugin demo/Source/PluginProcessor.h b/examples/audio plugin demo/Source/PluginProcessor.h similarity index 100% rename from extras/audio plugin demo/Source/PluginProcessor.h rename to examples/audio plugin demo/Source/PluginProcessor.h diff --git a/extras/audio plugin host/Builds/Linux/Makefile b/examples/audio plugin host/Builds/Linux/Makefile similarity index 100% rename from extras/audio plugin host/Builds/Linux/Makefile rename to examples/audio plugin host/Builds/Linux/Makefile diff --git a/extras/audio plugin host/Builds/MacOSX/Info.plist b/examples/audio plugin host/Builds/MacOSX/Info.plist similarity index 100% rename from extras/audio plugin host/Builds/MacOSX/Info.plist rename to examples/audio plugin host/Builds/MacOSX/Info.plist diff --git a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj similarity index 100% rename from extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj rename to examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj diff --git a/extras/example projects/Builds/MacOSX/RecentFilesMenuTemplate.nib b/examples/audio plugin host/Builds/MacOSX/RecentFilesMenuTemplate.nib similarity index 100% rename from extras/example projects/Builds/MacOSX/RecentFilesMenuTemplate.nib rename to examples/audio plugin host/Builds/MacOSX/RecentFilesMenuTemplate.nib diff --git a/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.sln similarity index 100% rename from extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.sln rename to examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.sln diff --git a/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj b/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj similarity index 100% rename from extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj rename to examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj diff --git a/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj.filters similarity index 100% rename from extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj.filters rename to examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj.filters diff --git a/extras/audio plugin host/Builds/VisualStudio2010/resources.rc b/examples/audio plugin host/Builds/VisualStudio2010/resources.rc similarity index 100% rename from extras/audio plugin host/Builds/VisualStudio2010/resources.rc rename to examples/audio plugin host/Builds/VisualStudio2010/resources.rc diff --git a/extras/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/AppConfig.h rename to examples/audio plugin host/JuceLibraryCode/AppConfig.h diff --git a/extras/audio plugin host/JuceLibraryCode/JuceHeader.h b/examples/audio plugin host/JuceLibraryCode/JuceHeader.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/JuceHeader.h rename to examples/audio plugin host/JuceLibraryCode/JuceHeader.h diff --git a/extras/example projects/JuceLibraryCode/ReadMe.txt b/examples/audio plugin host/JuceLibraryCode/ReadMe.txt similarity index 100% rename from extras/example projects/JuceLibraryCode/ReadMe.txt rename to examples/audio plugin host/JuceLibraryCode/ReadMe.txt diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_audio_basics/juce_audio_basics.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_audio_formats/juce_audio_formats.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_audio_processors/juce_audio_processors.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_audio_utils/juce_audio_utils.h diff --git a/extras/example projects/JuceLibraryCode/modules/juce_core/juce_core.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_core/juce_core.h similarity index 100% rename from extras/example projects/JuceLibraryCode/modules/juce_core/juce_core.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_core/juce_core.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_cryptography/juce_cryptography.h diff --git a/extras/example projects/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h similarity index 100% rename from extras/example projects/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_data_structures/juce_data_structures.h diff --git a/extras/example projects/JuceLibraryCode/modules/juce_events/juce_events.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_events/juce_events.h similarity index 100% rename from extras/example projects/JuceLibraryCode/modules/juce_events/juce_events.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_events/juce_events.h diff --git a/extras/example projects/JuceLibraryCode/modules/juce_graphics/juce_graphics.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_graphics/juce_graphics.h similarity index 100% rename from extras/example projects/JuceLibraryCode/modules/juce_graphics/juce_graphics.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_graphics/juce_graphics.h diff --git a/extras/example projects/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h similarity index 100% rename from extras/example projects/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_gui_basics/juce_gui_basics.h diff --git a/extras/example projects/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h similarity index 100% rename from extras/example projects/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_gui_extra/juce_gui_extra.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_opengl/juce_opengl.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_opengl/juce_opengl.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_opengl/juce_opengl.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_opengl/juce_opengl.h diff --git a/extras/audio plugin host/JuceLibraryCode/modules/juce_video/juce_video.h b/examples/audio plugin host/JuceLibraryCode/modules/juce_video/juce_video.h similarity index 100% rename from extras/audio plugin host/JuceLibraryCode/modules/juce_video/juce_video.h rename to examples/audio plugin host/JuceLibraryCode/modules/juce_video/juce_video.h diff --git a/extras/audio plugin host/Plugin Host.jucer b/examples/audio plugin host/Plugin Host.jucer similarity index 100% rename from extras/audio plugin host/Plugin Host.jucer rename to examples/audio plugin host/Plugin Host.jucer diff --git a/extras/audio plugin host/Source/FilterGraph.cpp b/examples/audio plugin host/Source/FilterGraph.cpp similarity index 100% rename from extras/audio plugin host/Source/FilterGraph.cpp rename to examples/audio plugin host/Source/FilterGraph.cpp diff --git a/extras/audio plugin host/Source/FilterGraph.h b/examples/audio plugin host/Source/FilterGraph.h similarity index 100% rename from extras/audio plugin host/Source/FilterGraph.h rename to examples/audio plugin host/Source/FilterGraph.h diff --git a/extras/audio plugin host/Source/GraphEditorPanel.cpp b/examples/audio plugin host/Source/GraphEditorPanel.cpp similarity index 100% rename from extras/audio plugin host/Source/GraphEditorPanel.cpp rename to examples/audio plugin host/Source/GraphEditorPanel.cpp diff --git a/extras/audio plugin host/Source/GraphEditorPanel.h b/examples/audio plugin host/Source/GraphEditorPanel.h similarity index 100% rename from extras/audio plugin host/Source/GraphEditorPanel.h rename to examples/audio plugin host/Source/GraphEditorPanel.h diff --git a/extras/audio plugin host/Source/HostStartup.cpp b/examples/audio plugin host/Source/HostStartup.cpp similarity index 100% rename from extras/audio plugin host/Source/HostStartup.cpp rename to examples/audio plugin host/Source/HostStartup.cpp diff --git a/extras/audio plugin host/Source/InternalFilters.cpp b/examples/audio plugin host/Source/InternalFilters.cpp similarity index 100% rename from extras/audio plugin host/Source/InternalFilters.cpp rename to examples/audio plugin host/Source/InternalFilters.cpp diff --git a/extras/audio plugin host/Source/InternalFilters.h b/examples/audio plugin host/Source/InternalFilters.h similarity index 100% rename from extras/audio plugin host/Source/InternalFilters.h rename to examples/audio plugin host/Source/InternalFilters.h diff --git a/extras/audio plugin host/Source/MainHostWindow.cpp b/examples/audio plugin host/Source/MainHostWindow.cpp similarity index 100% rename from extras/audio plugin host/Source/MainHostWindow.cpp rename to examples/audio plugin host/Source/MainHostWindow.cpp diff --git a/extras/audio plugin host/Source/MainHostWindow.h b/examples/audio plugin host/Source/MainHostWindow.h similarity index 100% rename from extras/audio plugin host/Source/MainHostWindow.h rename to examples/audio plugin host/Source/MainHostWindow.h diff --git a/extras/browser plugin demo/How to build a browser plugin.txt b/examples/browser plugin demo/How to build a browser plugin.txt similarity index 100% rename from extras/browser plugin demo/How to build a browser plugin.txt rename to examples/browser plugin demo/How to build a browser plugin.txt diff --git a/extras/browser plugin demo/build/mac/Info.plist b/examples/browser plugin demo/build/mac/Info.plist similarity index 100% rename from extras/browser plugin demo/build/mac/Info.plist rename to examples/browser plugin demo/build/mac/Info.plist diff --git a/extras/browser plugin demo/build/mac/JuceBrowserPluginDemo.xcodeproj/project.pbxproj b/examples/browser plugin demo/build/mac/JuceBrowserPluginDemo.xcodeproj/project.pbxproj similarity index 100% rename from extras/browser plugin demo/build/mac/JuceBrowserPluginDemo.xcodeproj/project.pbxproj rename to examples/browser plugin demo/build/mac/JuceBrowserPluginDemo.xcodeproj/project.pbxproj diff --git a/extras/browser plugin demo/build/win32/JuceBrowserPluginDemo.sln b/examples/browser plugin demo/build/win32/JuceBrowserPluginDemo.sln similarity index 100% rename from extras/browser plugin demo/build/win32/JuceBrowserPluginDemo.sln rename to examples/browser plugin demo/build/win32/JuceBrowserPluginDemo.sln diff --git a/extras/browser plugin demo/build/win32/JuceBrowserPluginDemo.vcproj b/examples/browser plugin demo/build/win32/JuceBrowserPluginDemo.vcproj similarity index 100% rename from extras/browser plugin demo/build/win32/JuceBrowserPluginDemo.vcproj rename to examples/browser plugin demo/build/win32/JuceBrowserPluginDemo.vcproj diff --git a/extras/browser plugin demo/src/AppConfig.h b/examples/browser plugin demo/src/AppConfig.h similarity index 100% rename from extras/browser plugin demo/src/AppConfig.h rename to examples/browser plugin demo/src/AppConfig.h diff --git a/extras/browser plugin demo/src/BrowserPluginCharacteristics.h b/examples/browser plugin demo/src/BrowserPluginCharacteristics.h similarity index 100% rename from extras/browser plugin demo/src/BrowserPluginCharacteristics.h rename to examples/browser plugin demo/src/BrowserPluginCharacteristics.h diff --git a/extras/browser plugin demo/src/JuceBrowserPluginDemo.cpp b/examples/browser plugin demo/src/JuceBrowserPluginDemo.cpp similarity index 100% rename from extras/browser plugin demo/src/JuceBrowserPluginDemo.cpp rename to examples/browser plugin demo/src/JuceBrowserPluginDemo.cpp diff --git a/extras/browser plugin demo/src/JuceHeader.h b/examples/browser plugin demo/src/JuceHeader.h similarity index 100% rename from extras/browser plugin demo/src/JuceHeader.h rename to examples/browser plugin demo/src/JuceHeader.h diff --git a/extras/browser plugin demo/src/juce_browser_plugin_wrapper.cpp b/examples/browser plugin demo/src/juce_browser_plugin_wrapper.cpp similarity index 100% rename from extras/browser plugin demo/src/juce_browser_plugin_wrapper.cpp rename to examples/browser plugin demo/src/juce_browser_plugin_wrapper.cpp diff --git a/extras/browser plugin demo/src/juce_browser_plugin_wrapper.mm b/examples/browser plugin demo/src/juce_browser_plugin_wrapper.mm similarity index 100% rename from extras/browser plugin demo/src/juce_browser_plugin_wrapper.mm rename to examples/browser plugin demo/src/juce_browser_plugin_wrapper.mm diff --git a/extras/browser plugin demo/src/juce_core_wrapper.cpp b/examples/browser plugin demo/src/juce_core_wrapper.cpp similarity index 100% rename from extras/browser plugin demo/src/juce_core_wrapper.cpp rename to examples/browser plugin demo/src/juce_core_wrapper.cpp diff --git a/extras/browser plugin demo/src/juce_core_wrapper.mm b/examples/browser plugin demo/src/juce_core_wrapper.mm similarity index 100% rename from extras/browser plugin demo/src/juce_core_wrapper.mm rename to examples/browser plugin demo/src/juce_core_wrapper.mm diff --git a/extras/browser plugin demo/src/juce_data_structures_wrapper.cpp b/examples/browser plugin demo/src/juce_data_structures_wrapper.cpp similarity index 100% rename from extras/browser plugin demo/src/juce_data_structures_wrapper.cpp rename to examples/browser plugin demo/src/juce_data_structures_wrapper.cpp diff --git a/extras/browser plugin demo/src/juce_data_structures_wrapper.mm b/examples/browser plugin demo/src/juce_data_structures_wrapper.mm similarity index 100% rename from extras/browser plugin demo/src/juce_data_structures_wrapper.mm rename to examples/browser plugin demo/src/juce_data_structures_wrapper.mm diff --git a/extras/browser plugin demo/src/juce_events_wrapper.cpp b/examples/browser plugin demo/src/juce_events_wrapper.cpp similarity index 100% rename from extras/browser plugin demo/src/juce_events_wrapper.cpp rename to examples/browser plugin demo/src/juce_events_wrapper.cpp diff --git a/extras/browser plugin demo/src/juce_events_wrapper.mm b/examples/browser plugin demo/src/juce_events_wrapper.mm similarity index 100% rename from extras/browser plugin demo/src/juce_events_wrapper.mm rename to examples/browser plugin demo/src/juce_events_wrapper.mm diff --git a/extras/browser plugin demo/src/juce_graphics_wrapper.cpp b/examples/browser plugin demo/src/juce_graphics_wrapper.cpp similarity index 100% rename from extras/browser plugin demo/src/juce_graphics_wrapper.cpp rename to examples/browser plugin demo/src/juce_graphics_wrapper.cpp diff --git a/extras/browser plugin demo/src/juce_graphics_wrapper.mm b/examples/browser plugin demo/src/juce_graphics_wrapper.mm similarity index 100% rename from extras/browser plugin demo/src/juce_graphics_wrapper.mm rename to examples/browser plugin demo/src/juce_graphics_wrapper.mm diff --git a/extras/browser plugin demo/src/juce_gui_basics_wrapper.cpp b/examples/browser plugin demo/src/juce_gui_basics_wrapper.cpp similarity index 100% rename from extras/browser plugin demo/src/juce_gui_basics_wrapper.cpp rename to examples/browser plugin demo/src/juce_gui_basics_wrapper.cpp diff --git a/extras/browser plugin demo/src/juce_gui_basics_wrapper.mm b/examples/browser plugin demo/src/juce_gui_basics_wrapper.mm similarity index 100% rename from extras/browser plugin demo/src/juce_gui_basics_wrapper.mm rename to examples/browser plugin demo/src/juce_gui_basics_wrapper.mm diff --git a/extras/browser plugin demo/test.html b/examples/browser plugin demo/test.html similarity index 100% rename from extras/browser plugin demo/test.html rename to examples/browser plugin demo/test.html