From dab1a549b92dc69e2c48b481d3b06f92c5812c98 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Thu, 2 Jul 2015 14:47:22 +0100
Subject: [PATCH] Introjucer: some internal refactoring.

---
 .../Builds/CodeBlocks/The Introjucer.cbp      |   4 +
 .../The Introjucer.xcodeproj/project.pbxproj  |  34 +--
 .../VisualStudio2005/The Introjucer.vcproj    |   1 +
 .../VisualStudio2008/The Introjucer.vcproj    |   1 +
 .../VisualStudio2010/The Introjucer.vcxproj   |   1 +
 .../The Introjucer.vcxproj.filters            |   3 +
 .../VisualStudio2012/The Introjucer.vcxproj   |   1 +
 .../The Introjucer.vcxproj.filters            |   3 +
 .../VisualStudio2013/The Introjucer.vcxproj   |   1 +
 .../The Introjucer.vcxproj.filters            |   3 +
 extras/Introjucer/Introjucer.jucer            |   2 +
 .../Application/jucer_AppearanceSettings.cpp  |   2 +-
 .../Application/jucer_AppearanceSettings.h    |   2 +-
 .../Source/BinaryData/juce_iconOLD.png        | Bin 19826 -> 0 bytes
 .../Project Saving/jucer_ProjectExporter.cpp  |   4 +-
 .../Project Saving/jucer_ProjectExporter.h    |   2 +-
 .../Project Saving/jucer_ProjectSaver.h       |   2 -
 .../Source/Project/jucer_Module.cpp           |  55 ++--
 .../Introjucer/Source/Project/jucer_Module.h  |   4 +-
 .../Source/Project/jucer_ModulesPanel.h       | 234 +++++++++---------
 .../Introjucer/Source/Project/jucer_Project.h |   6 +-
 .../Project/jucer_ProjectContentComponent.cpp |  38 +--
 .../Source/Project/jucer_TreeItemTypes.h      |  51 ++++
 23 files changed, 256 insertions(+), 198 deletions(-)
 delete mode 100644 extras/Introjucer/Source/BinaryData/juce_iconOLD.png
 create mode 100644 extras/Introjucer/Source/Project/jucer_TreeItemTypes.h

diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index 081ff60e53..a50ce73b08 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
@@ -513,6 +513,10 @@
       <Option compile="0"/>
       <Option link="0"/>
     </Unit>
+    <Unit filename="../../Source/Project/jucer_TreeItemTypes.h">
+      <Option compile="0"/>
+      <Option link="0"/>
+    </Unit>
     <Unit filename="../../Source/Utility/jucer_CodeHelpers.cpp"/>
     <Unit filename="../../Source/Utility/jucer_CodeHelpers.h">
       <Option compile="0"/>
diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
index ad738d81d1..0171a80572 100644
--- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
+++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj	
@@ -612,6 +612,7 @@
 		9D7689451732AF8333402B3A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ObjectTypes.cpp"; path = "../../Source/ComponentEditor/jucer_ObjectTypes.cpp"; sourceTree = "SOURCE_ROOT"; };
 		9DE1BC5241C70AF12B327932 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_DropShadowEffect.h"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.h"; sourceTree = "SOURCE_ROOT"; };
 		9E36C30D10A1EF9305E8D663 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_PropertiesFile.h"; path = "../../../../modules/juce_data_structures/app_properties/juce_PropertiesFile.h"; sourceTree = "SOURCE_ROOT"; };
+		9EA541503DBADC5FFDEB0282 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TreeItemTypes.h"; path = "../../Source/Project/jucer_TreeItemTypes.h"; sourceTree = "SOURCE_ROOT"; };
 		9EE339FCA2CFDAE060CB8FE6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_CallOutBox.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_CallOutBox.cpp"; sourceTree = "SOURCE_ROOT"; };
 		9EE5D1C3DFDD31D9D8237541 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentBoundsConstrainer.cpp"; path = "../../../../modules/juce_gui_basics/layout/juce_ComponentBoundsConstrainer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		9EF583A6201DBC813C2F63C4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_BinaryResources.cpp"; path = "../../Source/ComponentEditor/jucer_BinaryResources.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -773,7 +774,6 @@
 		CDF8F65F9079B2C14A740F0F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ImageButton.h"; path = "../../../../modules/juce_gui_basics/buttons/juce_ImageButton.h"; sourceTree = "SOURCE_ROOT"; };
 		CE1DFE4E3908943656E180AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_UnitTest.cpp"; path = "../../../../modules/juce_core/unit_tests/juce_UnitTest.cpp"; sourceTree = "SOURCE_ROOT"; };
 		CF0615A1AF1A514A60322B50 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MouseCursor.h"; path = "../../../../modules/juce_gui_basics/mouse/juce_MouseCursor.h"; sourceTree = "SOURCE_ROOT"; };
-		CF21D9DB3AEC0A4DCAB36A99 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_Icons.cpp"; path = "../../Source/Utility/jucer_Icons.cpp"; sourceTree = "SOURCE_ROOT"; };
 		CF6C8BD0DA3D8CD4E99EBADA = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		CF8011B3C67B609032974DA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_NewCppFileTemplate.cpp"; path = "../../Source/BinaryData/jucer_NewCppFileTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D00F311BFC3C2625C457CB9B = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
@@ -782,27 +782,23 @@
 		D0F1614CC861E8E0B59B7A06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Messaging.cpp"; path = "../../../../modules/juce_events/native/juce_linux_Messaging.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D141433D3FE81F20490DE928 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Desktop.h"; path = "../../../../modules/juce_gui_basics/components/juce_Desktop.h"; sourceTree = "SOURCE_ROOT"; };
 		D1F9B0E9F5D54FE48BEB46EA = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		D253F74B7F5734984E568CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Files.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D2F1CF252F7EC62B35A21CB6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DropShadowEffect.cpp"; path = "../../../../modules/juce_graphics/effects/juce_DropShadowEffect.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D2F80DA0946A5EE01FC016CA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CharPointer_UTF32.h"; path = "../../../../modules/juce_core/text/juce_CharPointer_UTF32.h"; sourceTree = "SOURCE_ROOT"; };
 		D374DC78AAC02504576AA9B3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GroupComponentHandler.h"; path = "../../Source/ComponentEditor/components/jucer_GroupComponentHandler.h"; sourceTree = "SOURCE_ROOT"; };
-		D3E139185095C486DD3D61F2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TranslationTool.h"; path = "../../Source/Utility/jucer_TranslationTool.h"; sourceTree = "SOURCE_ROOT"; };
+		D376B9B54EC944E766AFEC45 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PopupMenu.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_PopupMenu.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D4444EC6342A2A7BC4F7BC46 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ComponentTextProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_ComponentTextProperty.h"; sourceTree = "SOURCE_ROOT"; };
 		D4697A0232AECE5DAC5E332E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChoicePropertyComponent.cpp"; path = "../../../../modules/juce_gui_basics/properties/juce_ChoicePropertyComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D4E56676E2EF83404EDCBA8C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_TextEditor.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_TextEditor.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D4F2D42C58F4D86E00E76F31 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandID.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandID.h"; sourceTree = "SOURCE_ROOT"; };
-		D503780AB98993E8F0BA1311 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageComponent.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ImageComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
-		D5057D7B18ABD5E810A6F830 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeface.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D526C38D581425949BA0E4AC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_FilePreviewComponent.h"; path = "../../Source/Application/jucer_FilePreviewComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		D53B54D1786A1FFC024BF064 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_cryptography.mm"; path = "../../../../modules/juce_cryptography/juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; };
 		D678882D133090214AF681BC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ThreadLocalValue.h"; path = "../../../../modules/juce_core/threads/juce_ThreadLocalValue.h"; sourceTree = "SOURCE_ROOT"; };
 		D75EAC16FAECCC51E3669193 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ApplicationCommandInfo.h"; path = "../../../../modules/juce_gui_basics/commands/juce_ApplicationCommandInfo.h"; sourceTree = "SOURCE_ROOT"; };
-		D7A7F1AA9F313B0CCAAA73A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MathsFunctions.h"; path = "../../../../modules/juce_core/maths/juce_MathsFunctions.h"; sourceTree = "SOURCE_ROOT"; };
-		D800DE818BEDBF4579D15B1D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; };
 		D87FC8F6834E9DC9C8E88B94 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_JustificationProperty.h"; path = "../../Source/ComponentEditor/properties/jucer_JustificationProperty.h"; sourceTree = "SOURCE_ROOT"; };
+		D926E13AB5AD647A7A00F486 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D92A6E9404A30EED32DCE4ED = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_RelativePositionedRectangle.h"; path = "../../Source/ComponentEditor/ui/jucer_RelativePositionedRectangle.h"; sourceTree = "SOURCE_ROOT"; };
-		D9B077E2ECDDA94961E134D7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
 		DA345D5B9DABD049F90DC96F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_GeneratedCode.h"; path = "../../Source/ComponentEditor/jucer_GeneratedCode.h"; sourceTree = "SOURCE_ROOT"; };
-		DB20268A566DABEAE3F2CBEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DBE0CDE1B017190ABBFF557C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectExport_CodeBlocks.h"; path = "../../Source/Project Saving/jucer_ProjectExport_CodeBlocks.h"; sourceTree = "SOURCE_ROOT"; };
 		DC5E7FF30B01118F6DAEC38F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Time.cpp"; path = "../../../../modules/juce_core/time/juce_Time.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DC922C6A65D260C18E888E49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_ComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -818,22 +814,31 @@
 		E2DBA3307837B64AFCCD8F8D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_File.cpp"; path = "../../../../modules/juce_core/files/juce_File.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E3B56C5718D87CA0EFCB2662 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_AudioComponentTemplate.cpp"; path = "../../Source/BinaryData/jucer_AudioComponentTemplate.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E4BB22E27C5AA4B666F265BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TextButtonHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TextButtonHandler.h"; sourceTree = "SOURCE_ROOT"; };
+		E4BD4C43370651B49F75855B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate_SimpleWindow.cpp"; path = "../../Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
+		E570E57CC1FCEF78B54A7084 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileOutputStream.h"; path = "../../../../modules/juce_core/files/juce_FileOutputStream.h"; sourceTree = "SOURCE_ROOT"; };
 		E5D6C36496F5BC84D7213BE8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		E62D9BA6E92FE7BB6EF65699 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_JSON.h"; path = "../../../../modules/juce_core/javascript/juce_JSON.h"; sourceTree = "SOURCE_ROOT"; };
 		E65A820D34BF39478B7C5925 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_DocumentEditorComponent.h"; path = "../../Source/Application/jucer_DocumentEditorComponent.h"; sourceTree = "SOURCE_ROOT"; };
+		E6F5CEC32EDC917B054467EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../../../modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; };
+		E720FBCD836FF3AA466C31B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E96597BBC6A98255B51B94DC = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		25F52316D256B4534BED16D1 = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
+		CF21D9DB3AEC0A4DCAB36A99 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_Icons.cpp"; path = "../../Source/Utility/jucer_Icons.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D10D51A0A2D63F38B4D86A60 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ResourceFile.cpp"; path = "../../Source/Project Saving/jucer_ResourceFile.cpp"; sourceTree = "SOURCE_ROOT"; };
-		D253F74B7F5734984E568CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Files.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Files.cpp"; sourceTree = "SOURCE_ROOT"; };
-		D376B9B54EC944E766AFEC45 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_PopupMenu.cpp"; path = "../../../../modules/juce_gui_basics/menus/juce_PopupMenu.cpp"; sourceTree = "SOURCE_ROOT"; };
+		D3E139185095C486DD3D61F2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TranslationTool.h"; path = "../../Source/Utility/jucer_TranslationTool.h"; sourceTree = "SOURCE_ROOT"; };
+		D503780AB98993E8F0BA1311 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageComponent.cpp"; path = "../../../../modules/juce_gui_basics/widgets/juce_ImageComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
+		D5057D7B18ABD5E810A6F830 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_DirectWriteTypeface.cpp"; path = "../../../../modules/juce_graphics/native/juce_win32_DirectWriteTypeface.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D6C91E2BF537F75A80F5C1DB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ListBox.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ListBox.h"; sourceTree = "SOURCE_ROOT"; };
 		D780ED33573AED5AD383A036 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CaretComponent.h"; path = "../../../../modules/juce_gui_basics/keyboard/juce_CaretComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		D782DA091AD3ECE158FC6A5F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ButtonPropertyComponent.h"; path = "../../../../modules/juce_gui_basics/properties/juce_ButtonPropertyComponent.h"; sourceTree = "SOURCE_ROOT"; };
-		D926E13AB5AD647A7A00F486 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Network.cpp"; path = "../../../../modules/juce_core/native/juce_linux_Network.cpp"; sourceTree = "SOURCE_ROOT"; };
+		D7A7F1AA9F313B0CCAAA73A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MathsFunctions.h"; path = "../../../../modules/juce_core/maths/juce_MathsFunctions.h"; sourceTree = "SOURCE_ROOT"; };
+		D800DE818BEDBF4579D15B1D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; };
 		D9342535EA61901A1AD816C6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_linux_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
 		D95D7B49EC6C6BDCB5A1B988 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_ios_MessageManager.mm"; path = "../../../../modules/juce_events/native/juce_ios_MessageManager.mm"; sourceTree = "SOURCE_ROOT"; };
+		D9B077E2ECDDA94961E134D7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_StringPairArray.h"; path = "../../../../modules/juce_core/text/juce_StringPairArray.h"; sourceTree = "SOURCE_ROOT"; };
 		D9E59DE07A815AB303A297D9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_data_structures.mm"; path = "../../../../modules/juce_data_structures/juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; };
 		DAF84A553D264705FA6EB6FF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_TreeViewHandler.h"; path = "../../Source/ComponentEditor/components/jucer_TreeViewHandler.h"; sourceTree = "SOURCE_ROOT"; };
+		DB20268A566DABEAE3F2CBEE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RectanglePlacement.cpp"; path = "../../../../modules/juce_graphics/placement/juce_RectanglePlacement.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DB876F7873F42DC685A58CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_JPEGLoader.cpp"; path = "../../../../modules/juce_graphics/image_formats/juce_JPEGLoader.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DCCB75165B7C73A589498E87 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_linux_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_linux_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; };
 		DD2494D5F1C081898D616AF5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_KeyListener.cpp"; path = "../../../../modules/juce_gui_basics/keyboard/juce_KeyListener.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -849,19 +854,15 @@
 		E3869AC657E984565F1718AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ConnectedChildProcess.h"; path = "../../../../modules/juce_events/interprocess/juce_ConnectedChildProcess.h"; sourceTree = "SOURCE_ROOT"; };
 		E3FF16862AA1B2F943DC616C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ImageCache.cpp"; path = "../../../../modules/juce_graphics/images/juce_ImageCache.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E446FFE889CD490FDE3F0F2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ThreadWithProgressWindow.cpp"; path = "../../../../modules/juce_gui_basics/windows/juce_ThreadWithProgressWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E4BD4C43370651B49F75855B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_MainTemplate_SimpleWindow.cpp"; path = "../../Source/BinaryData/jucer_MainTemplate_SimpleWindow.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E4E74B2BC3F3CB5A4F4DC55E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_module_info"; path = "../../../../modules/juce_gui_basics/juce_module_info"; sourceTree = "SOURCE_ROOT"; };
 		E4F9D1E097CC2C1D1291823C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_LookAndFeel_V2.cpp"; path = "../../../../modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E530742870F07704E9616358 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_ToolbarItemComponent.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_ToolbarItemComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E54D0994D31E20A0A05EBA2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_SystemTrayIconComponent.h"; path = "../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"; sourceTree = "SOURCE_ROOT"; };
-		E570E57CC1FCEF78B54A7084 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileOutputStream.h"; path = "../../../../modules/juce_core/files/juce_FileOutputStream.h"; sourceTree = "SOURCE_ROOT"; };
 		E60E28D1B7491047DEA236AE = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_ProjectContentComponent.h"; path = "../../Source/Project/jucer_ProjectContentComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E63F54CF8D5D922A319C6962 = {isa = PBXFileReference; lastKnownFileType = image.png; name = projectIconXcodeIOS.png; path = ../../Source/BinaryData/projectIconXcodeIOS.png; sourceTree = "SOURCE_ROOT"; };
 		E642193A9990C48CFB6479A9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileListComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.h"; sourceTree = "SOURCE_ROOT"; };
 		E654E3A3CD45A888C5F773DF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_MenuBarModel.h"; path = "../../../../modules/juce_gui_basics/menus/juce_MenuBarModel.h"; sourceTree = "SOURCE_ROOT"; };
-		E6F5CEC32EDC917B054467EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ReadWriteLock.cpp"; path = "../../../../modules/juce_core/threads/juce_ReadWriteLock.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E70CA21960A64CCB835725FF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "jucer_ProjectType.cpp"; path = "../../Source/Project/jucer_ProjectType.cpp"; sourceTree = "SOURCE_ROOT"; };
-		E720FBCD836FF3AA466C31B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_HighResolutionTimer.cpp"; path = "../../../../modules/juce_core/threads/juce_HighResolutionTimer.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E73C7E17116F6085765622E3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Drawable.h"; path = "../../../../modules/juce_gui_basics/drawables/juce_Drawable.h"; sourceTree = "SOURCE_ROOT"; };
 		E7A4604F766ABC8BE26C94A1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_RelativeParallelogram.cpp"; path = "../../../../modules/juce_gui_basics/positioning/juce_RelativeParallelogram.cpp"; sourceTree = "SOURCE_ROOT"; };
 		E7B6A0CBA0D27A095E83F5B7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_win32_WebBrowserComponent.cpp"; path = "../../../../modules/juce_gui_extra/native/juce_win32_WebBrowserComponent.cpp"; sourceTree = "SOURCE_ROOT"; };
@@ -1083,7 +1084,8 @@
 					47B49049B85EED74D29C9906,
 					4F6365A0D2D51337151D85C3,
 					E70CA21960A64CCB835725FF,
-					B8385E9A644BD3CD94876448, ); name = Project; sourceTree = "<group>"; };
+					B8385E9A644BD3CD94876448,
+					9EA541503DBADC5FFDEB0282, ); name = Project; sourceTree = "<group>"; };
 		D93DED1F5F1B0E49E10A6760 = {isa = PBXGroup; children = (
 					9B9CAD20E1243B4351B4C8D8,
 					914ADDB50ED7365F08BA91F9,
diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj
index 3348d4f86c..7668acb71d 100644
--- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj	
@@ -274,6 +274,7 @@
         <File RelativePath="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
         <File RelativePath="..\..\Source\Project\jucer_ProjectType.cpp"/>
         <File RelativePath="..\..\Source\Project\jucer_ProjectType.h"/>
+        <File RelativePath="..\..\Source\Project\jucer_TreeItemTypes.h"/>
       </Filter>
       <Filter Name="Utility">
         <File RelativePath="..\..\Source\Utility\jucer_CodeHelpers.cpp"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj
index 8ff8f66169..449f5789a7 100644
--- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
+++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj	
@@ -274,6 +274,7 @@
         <File RelativePath="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
         <File RelativePath="..\..\Source\Project\jucer_ProjectType.cpp"/>
         <File RelativePath="..\..\Source\Project\jucer_ProjectType.h"/>
+        <File RelativePath="..\..\Source\Project\jucer_TreeItemTypes.h"/>
       </Filter>
       <Filter Name="Utility">
         <File RelativePath="..\..\Source\Utility\jucer_CodeHelpers.cpp"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj
index b384e1bf72..e61feddf16 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj	
@@ -1145,6 +1145,7 @@
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_File.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h"/>
+    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_Colours.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters
index b392e26112..91449accd2 100644
--- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters	
@@ -1626,6 +1626,9 @@
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h">
       <Filter>The Introjucer\Project</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h">
+      <Filter>The Introjucer\Project</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h">
       <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj
index e5a1f691fd..2c95e3abd8 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj	
@@ -1151,6 +1151,7 @@
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_File.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h"/>
+    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_Colours.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters
index b392e26112..91449accd2 100644
--- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj.filters	
@@ -1626,6 +1626,9 @@
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h">
       <Filter>The Introjucer\Project</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h">
+      <Filter>The Introjucer\Project</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h">
       <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
index aa041b6c32..59dbe2fea6 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj	
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj	
@@ -1151,6 +1151,7 @@
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_File.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectTree_Group.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h"/>
+    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_Colours.h"/>
     <ClInclude Include="..\..\Source\Utility\jucer_FileHelpers.h"/>
diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
index 42c10be993..127a2fedb5 100644
--- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters	
+++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters	
@@ -1626,6 +1626,9 @@
     <ClInclude Include="..\..\Source\Project\jucer_ProjectType.h">
       <Filter>The Introjucer\Project</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Source\Project\jucer_TreeItemTypes.h">
+      <Filter>The Introjucer\Project</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\Source\Utility\jucer_CodeHelpers.h">
       <Filter>The Introjucer\Utility</Filter>
     </ClInclude>
diff --git a/extras/Introjucer/Introjucer.jucer b/extras/Introjucer/Introjucer.jucer
index a6f64e59a8..1b29bdef44 100644
--- a/extras/Introjucer/Introjucer.jucer
+++ b/extras/Introjucer/Introjucer.jucer
@@ -432,6 +432,8 @@
             file="Source/Project/jucer_ProjectType.cpp"/>
       <FILE id="davId" name="jucer_ProjectType.h" compile="0" resource="0"
             file="Source/Project/jucer_ProjectType.h"/>
+      <FILE id="n5C8LS" name="jucer_TreeItemTypes.h" compile="0" resource="0"
+            file="Source/Project/jucer_TreeItemTypes.h"/>
     </GROUP>
     <GROUP id="Ga8fLmv" name="Utility">
       <FILE id="mceJWJc" name="jucer_CodeHelpers.cpp" compile="1" resource="0"
diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
index 00286ad46e..ccb3325630 100644
--- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
+++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.cpp
@@ -537,7 +537,7 @@ IntrojucerLookAndFeel::IntrojucerLookAndFeel()
 
 int IntrojucerLookAndFeel::getTabButtonBestWidth (TabBarButton&, int)   { return 120; }
 
-static Colour getTabBackgroundColour (TabBarButton& button)
+Colour IntrojucerLookAndFeel::getTabBackgroundColour (TabBarButton& button)
 {
     const Colour bkg (button.findColour (mainBackgroundColourId).contrasting (0.15f));
 
diff --git a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
index d1f0b846a5..4885d3ae32 100644
--- a/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
+++ b/extras/Introjucer/Source/Application/jucer_AppearanceSettings.h
@@ -88,8 +88,8 @@ public:
 
     void drawTabButton (TabBarButton& button, Graphics&, bool isMouseOver, bool isMouseDown) override;
     void drawTabAreaBehindFrontButton (TabbedButtonBar&, Graphics&, int, int) override {}
-
     int getTabButtonBestWidth (TabBarButton&, int tabDepth) override;
+    static Colour getTabBackgroundColour (TabBarButton&);
 
 private:
     Image backgroundTexture;
diff --git a/extras/Introjucer/Source/BinaryData/juce_iconOLD.png b/extras/Introjucer/Source/BinaryData/juce_iconOLD.png
deleted file mode 100644
index 396aaeccb821d497fdab5d3e406d9a3046c7ee54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19826
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%0AHl8sA6Rlewn?6!
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
UM+%(-DgXcg07*qoM6N<$f`y&AK>z>%

diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp
index 1df27453ac..5ae219a0fc 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.cpp	
@@ -344,10 +344,10 @@ void ProjectExporter::removePathForModule (const String& moduleID)
     paths.removeChild (m, project.getUndoManagerFor (settings));
 }
 
-RelativePath ProjectExporter::getModuleFolderRelativeToProject (const String& moduleID, ProjectSaver& projectSaver) const
+RelativePath ProjectExporter::getModuleFolderRelativeToProject (const String& moduleID) const
 {
     if (project.getModules().shouldCopyModuleFilesLocally (moduleID).getValue())
-        return RelativePath (project.getRelativePathForFile (projectSaver.getLocalModuleFolder (moduleID)),
+        return RelativePath (project.getRelativePathForFile (project.getLocalModuleFolder (moduleID)),
                              RelativePath::projectFolder);
 
     String path (getPathForModuleString (moduleID));
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h
index cf9519f62c..1b42158b67 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h	
@@ -122,7 +122,7 @@ public:
     String getLegacyModulePath() const;
 
     // Returns a path to the actual module folder itself
-    RelativePath getModuleFolderRelativeToProject (const String& moduleID, ProjectSaver& projectSaver) const;
+    RelativePath getModuleFolderRelativeToProject (const String& moduleID) const;
     void updateOldModulePaths();
 
     RelativePath rebaseFromProjectFolderToBuildTarget (const RelativePath& path) const;
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h
index ebe5ea0bef..97ad2a874e 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h	
@@ -160,8 +160,6 @@ public:
     static String getJuceCodeGroupName()                            { return "Juce Library Code"; }
 
     File getGeneratedCodeFolder() const                             { return generatedCodeFolder; }
-    File getLocalModulesFolder() const                              { return generatedCodeFolder.getChildFile ("modules"); }
-    File getLocalModuleFolder (const String& moduleID) const        { return getLocalModulesFolder().getChildFile (moduleID); }
 
     bool replaceFileIfDifferent (const File& f, const MemoryOutputStream& newData)
     {
diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp
index 38830c34bd..c2b016be16 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Module.cpp
@@ -240,7 +240,7 @@ File LibraryModule::getModuleHeaderFile (const File& folder) const
 //==============================================================================
 void LibraryModule::writeIncludes (ProjectSaver& projectSaver, OutputStream& out)
 {
-    const File localModuleFolder (projectSaver.getLocalModuleFolder (getID()));
+    const File localModuleFolder (projectSaver.project.getLocalModuleFolder (getID()));
     const File localHeader (getModuleHeaderFile (localModuleFolder));
 
     localModuleFolder.createDirectory();
@@ -308,7 +308,7 @@ void LibraryModule::createLocalHeaderWrapper (ProjectSaver& projectSaver, const
 
     for (Project::ExporterIterator exporter (project); exporter.next();)
     {
-        const RelativePath headerFromProject (exporter->getModuleFolderRelativeToProject (getID(), projectSaver)
+        const RelativePath headerFromProject (exporter->getModuleFolderRelativeToProject (getID())
                                                 .getChildFile (originalHeader.getFileName()));
 
         const RelativePath fileFromHere (headerFromProject.rebased (project.getProjectFolder(),
@@ -337,7 +337,7 @@ void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& pr
 {
     Project& project = exporter.getProject();
 
-    exporter.addToExtraSearchPaths (exporter.getModuleFolderRelativeToProject (getID(), projectSaver).getParentDirectory());
+    exporter.addToExtraSearchPaths (exporter.getModuleFolderRelativeToProject (getID()).getParentDirectory());
 
     const String extraDefs (moduleInfo.getPreprocessorDefs().trim());
 
@@ -348,13 +348,13 @@ void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& pr
         Array<File> compiled;
 
         const File localModuleFolder = project.getModules().shouldCopyModuleFilesLocally (getID()).getValue()
-                                          ? projectSaver.getLocalModuleFolder (getID())
+                                          ? project.getLocalModuleFolder (getID())
                                           : moduleInfo.getFolder();
 
-        findAndAddCompiledCode (exporter, projectSaver, localModuleFolder, compiled);
+        findAndAddCompiledUnits (exporter, &projectSaver, localModuleFolder, compiled);
 
         if (project.getModules().shouldShowAllModuleFilesInProject (getID()).getValue())
-            addBrowsableCode (exporter, projectSaver, compiled, localModuleFolder);
+            addBrowseableCode (exporter, compiled, localModuleFolder);
     }
 
     if (isVSTPluginHost (project))  VSTHelpers::addVSTFolderToPath (exporter, false);
@@ -479,7 +479,7 @@ struct FileSorter
 
 void LibraryModule::findWildcardMatches (const File& localModuleFolder, const String& wildcardPath, Array<File>& result) const
 {
-    String path (wildcardPath.upToLastOccurrenceOf ("/", false, false));
+    String path     (wildcardPath.upToLastOccurrenceOf ("/", false, false));
     String wildCard (wildcardPath.fromLastOccurrenceOf ("/", false, false));
 
     Array<File> tempList;
@@ -497,21 +497,16 @@ void LibraryModule::findWildcardMatches (const File& localModuleFolder, const St
 
 static bool fileTargetMatches (ProjectExporter& exporter, const String& target)
 {
-    if (exporter.isXcode())
-        return exporterTargetMatches ("xcode", target);
-    if (exporter.isWindows())
-        return exporterTargetMatches ("msvc", target);
-    if (exporter.isLinux())
-        return exporterTargetMatches ("linux", target);
-    if (exporter.isAndroid())
-        return exporterTargetMatches ("android", target);
-    if (exporter.isCodeBlocksWindows())
-        return exporterTargetMatches ("mingw", target);
+    if (exporter.isXcode())                 return exporterTargetMatches ("xcode",   target);
+    if (exporter.isWindows())               return exporterTargetMatches ("msvc",    target);
+    if (exporter.isLinux())                 return exporterTargetMatches ("linux",   target);
+    if (exporter.isAndroid())               return exporterTargetMatches ("android", target);
+    if (exporter.isCodeBlocksWindows())     return exporterTargetMatches ("mingw",   target);
 
     return target.isEmpty();
 }
 
-static bool fileShouldBeAdded (ProjectExporter& exporter, const var& properties)
+static bool fileShouldBeCompiled (ProjectExporter& exporter, const var& properties)
 {
     if (! fileTargetMatches (exporter, properties["target"].toString()))
         return false;
@@ -525,8 +520,8 @@ static bool fileShouldBeAdded (ProjectExporter& exporter, const var& properties)
     return true;
 }
 
-void LibraryModule::findAndAddCompiledCode (ProjectExporter& exporter, ProjectSaver& projectSaver,
-                                            const File& localModuleFolder, Array<File>& result) const
+void LibraryModule::findAndAddCompiledUnits (ProjectExporter& exporter, ProjectSaver* projectSaver,
+                                             const File& localModuleFolder, Array<File>& result) const
 {
     const var compileArray (moduleInfo.moduleInfo ["compile"]); // careful to keep this alive while the array is in use!
 
@@ -537,18 +532,21 @@ void LibraryModule::findAndAddCompiledCode (ProjectExporter& exporter, ProjectSa
             const var& file = files->getReference(i);
             const String filename (file ["file"].toString());
 
-            if (filename.isNotEmpty() && fileShouldBeAdded (exporter, file))
+            if (filename.isNotEmpty() && fileShouldBeCompiled (exporter, file))
             {
                 const File compiledFile (localModuleFolder.getChildFile (filename));
                 result.add (compiledFile);
 
-                Project::Item item (projectSaver.addFileToGeneratedGroup (compiledFile));
+                if (projectSaver != nullptr)
+                {
+                    Project::Item item (projectSaver->addFileToGeneratedGroup (compiledFile));
 
-                if (file ["warnings"].toString().equalsIgnoreCase ("disabled"))
-                    item.getShouldInhibitWarningsValue() = true;
+                    if (file ["warnings"].toString().equalsIgnoreCase ("disabled"))
+                        item.getShouldInhibitWarningsValue() = true;
 
-                if (file ["stdcall"])
-                    item.getShouldUseStdCallValue() = true;
+                    if (file ["stdcall"])
+                        item.getShouldUseStdCallValue() = true;
+                }
             }
         }
     }
@@ -582,15 +580,14 @@ void LibraryModule::findBrowseableFiles (const File& localModuleFolder, Array<Fi
             findWildcardMatches (localModuleFolder, files->getReference(i), filesFound);
 }
 
-void LibraryModule::addBrowsableCode (ProjectExporter& exporter, ProjectSaver& projectSaver,
-                                      const Array<File>& compiled, const File& localModuleFolder) const
+void LibraryModule::addBrowseableCode (ProjectExporter& exporter, const Array<File>& compiled, const File& localModuleFolder) const
 {
     if (sourceFiles.size() == 0)
         findBrowseableFiles (localModuleFolder, sourceFiles);
 
     Project::Item sourceGroup (Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID()));
 
-    const RelativePath moduleFromProject (exporter.getModuleFolderRelativeToProject (getID(), projectSaver));
+    const RelativePath moduleFromProject (exporter.getModuleFolderRelativeToProject (getID()));
 
     for (int i = 0; i < sourceFiles.size(); ++i)
     {
diff --git a/extras/Introjucer/Source/Project/jucer_Module.h b/extras/Introjucer/Source/Project/jucer_Module.h
index fecd48319a..00210d80c5 100644
--- a/extras/Introjucer/Source/Project/jucer_Module.h
+++ b/extras/Introjucer/Source/Project/jucer_Module.h
@@ -101,6 +101,7 @@ public:
     void createPropertyEditors (ProjectExporter&, PropertyListBuilder&) const;
     void getConfigFlags (Project&, OwnedArray<Project::ConfigFlag>& flags) const;
     void findBrowseableFiles (const File& localModuleFolder, Array<File>& files) const;
+    void findAndAddCompiledUnits (ProjectExporter&, ProjectSaver*, const File& localModuleFolder, Array<File>& result) const;
 
     ModuleDescription moduleInfo;
 
@@ -110,8 +111,7 @@ private:
     File getModuleHeaderFile (const File& folder) const;
 
     void findWildcardMatches (const File& localModuleFolder, const String& wildcardPath, Array<File>& result) const;
-    void findAndAddCompiledCode (ProjectExporter&, ProjectSaver&, const File& localModuleFolder, Array<File>& result) const;
-    void addBrowsableCode (ProjectExporter&, ProjectSaver&, const Array<File>& compiled, const File& localModuleFolder) const;
+    void addBrowseableCode (ProjectExporter&, const Array<File>& compiled, const File& localModuleFolder) const;
     void createLocalHeaderWrapper (ProjectSaver&, const File& originalHeader, const File& localHeader) const;
 
     bool isAUPluginHost (const Project&) const;
diff --git a/extras/Introjucer/Source/Project/jucer_ModulesPanel.h b/extras/Introjucer/Source/Project/jucer_ModulesPanel.h
index 2013afe57d..d11a2abbf0 100644
--- a/extras/Introjucer/Source/Project/jucer_ModulesPanel.h
+++ b/extras/Introjucer/Source/Project/jucer_ModulesPanel.h
@@ -418,124 +418,124 @@ private:
         ModulesPanel& panel;
     };
 
+    //==============================================================================
+    class DownloadAndInstallThread   : public ThreadWithProgressWindow
+    {
+    public:
+        DownloadAndInstallThread (const Array<ModuleDescription>& modulesToInstall)
+            : ThreadWithProgressWindow ("Installing New Modules", true, true),
+              result (Result::ok()),
+              modules (modulesToInstall)
+        {
+        }
+
+        static void updateModulesFromWeb (Project& project, const Array<ModuleDescription>& mods)
+        {
+            DownloadAndInstallThread d (mods);
+
+            if (d.runThread())
+            {
+                if (d.result.failed())
+                {
+                    AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon,
+                                                      "Module Install Failed",
+                                                      d.result.getErrorMessage());
+                }
+                else
+                {
+                    for (int i = 0; i < d.modules.size(); ++i)
+                        project.getModules().addModule (d.modules.getReference(i).manifestFile,
+                                                        project.getModules().areMostModulesCopiedLocally());
+                }
+            }
+        }
+
+        static void addModuleFromWebsite (Project& project, const ModuleDescription& module)
+        {
+            Array<ModuleDescription> mods;
+            mods.add (module);
+
+            static File lastLocation (EnabledModuleList::findDefaultModulesFolder (project));
+
+            FileChooser fc ("Select the parent folder for the new module...", lastLocation, String::empty, false);
+
+            if (fc.browseForDirectory())
+            {
+                lastLocation = fc.getResult();
+
+                if (lastLocation.getChildFile (ModuleDescription::getManifestFileName()).exists())
+                {
+                    AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon,
+                                                      "Adding Module",
+                                                      "You chose a folder that appears to be a module.\n\n"
+                                                      "You need to select the *parent* folder inside which the new modules will be created.");
+                    return;
+                }
+
+                for (int i = 0; i < mods.size(); ++i)
+                    mods.getReference(i).manifestFile = lastLocation.getChildFile (mods.getReference(i).getID())
+                                                                    .getChildFile (ModuleDescription::getManifestFileName());
+
+                updateModulesFromWeb (project, mods);
+            }
+        }
+
+        void run() override
+        {
+            for (int i = 0; i < modules.size(); ++i)
+            {
+                const ModuleDescription& m = modules.getReference(i);
+
+                setProgress (i / (double) modules.size());
+
+                MemoryBlock downloaded;
+                result = download (m, downloaded);
+
+                if (result.failed() || threadShouldExit())
+                    break;
+
+                result = unzip (m, downloaded);
+
+                if (result.failed() || threadShouldExit())
+                    break;
+            }
+        }
+
+        Result download (const ModuleDescription& m, MemoryBlock& dest)
+        {
+            setStatusMessage ("Downloading " + m.getID() + "...");
+
+            const ScopedPointer<InputStream> in (m.url.createInputStream (false, nullptr, nullptr, String::empty, 10000));
+
+            if (in != nullptr && in->readIntoMemoryBlock (dest))
+                return Result::ok();
+
+            return Result::fail ("Failed to download from: " + m.url.toString (false));
+        }
+
+        Result unzip (const ModuleDescription& m, const MemoryBlock& data)
+        {
+            setStatusMessage ("Installing " + m.getID() + "...");
+
+            MemoryInputStream input (data, false);
+            ZipFile zip (input);
+
+            if (zip.getNumEntries() == 0)
+                return Result::fail ("The downloaded file wasn't a valid module file!");
+
+            if (! m.getFolder().deleteRecursively())
+                return Result::fail ("Couldn't delete the existing folder:\n" + m.getFolder().getFullPathName());
+
+            return zip.uncompressTo (m.getFolder().getParentDirectory(), true);
+        }
+
+        Result result;
+        Array<ModuleDescription> modules;
+
+        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DownloadAndInstallThread)
+    };
+
     ScopedPointer<WebsiteUpdateFetchThread> webUpdateThread;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ModulesPanel)
 };
-
-//==============================================================================
-class DownloadAndInstallThread   : public ThreadWithProgressWindow
-{
-public:
-    DownloadAndInstallThread (const Array<ModuleDescription>& modulesToInstall)
-        : ThreadWithProgressWindow ("Installing New Modules", true, true),
-          result (Result::ok()),
-          modules (modulesToInstall)
-    {
-    }
-
-    static void updateModulesFromWeb (Project& project, const Array<ModuleDescription>& mods)
-    {
-        DownloadAndInstallThread d (mods);
-
-        if (d.runThread())
-        {
-            if (d.result.failed())
-            {
-                AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon,
-                                                  "Module Install Failed",
-                                                  d.result.getErrorMessage());
-            }
-            else
-            {
-                for (int i = 0; i < d.modules.size(); ++i)
-                    project.getModules().addModule (d.modules.getReference(i).manifestFile,
-                                                    project.getModules().areMostModulesCopiedLocally());
-            }
-        }
-    }
-
-    static void addModuleFromWebsite (Project& project, const ModuleDescription& module)
-    {
-        Array<ModuleDescription> mods;
-        mods.add (module);
-
-        static File lastLocation (EnabledModuleList::findDefaultModulesFolder (project));
-
-        FileChooser fc ("Select the parent folder for the new module...", lastLocation, String::empty, false);
-
-        if (fc.browseForDirectory())
-        {
-            lastLocation = fc.getResult();
-
-            if (lastLocation.getChildFile (ModuleDescription::getManifestFileName()).exists())
-            {
-                AlertWindow::showMessageBoxAsync (AlertWindow::WarningIcon,
-                                                  "Adding Module",
-                                                  "You chose a folder that appears to be a module.\n\n"
-                                                  "You need to select the *parent* folder inside which the new modules will be created.");
-                return;
-            }
-
-            for (int i = 0; i < mods.size(); ++i)
-                mods.getReference(i).manifestFile = lastLocation.getChildFile (mods.getReference(i).getID())
-                                                                .getChildFile (ModuleDescription::getManifestFileName());
-
-            updateModulesFromWeb (project, mods);
-        }
-    }
-
-    void run() override
-    {
-        for (int i = 0; i < modules.size(); ++i)
-        {
-            const ModuleDescription& m = modules.getReference(i);
-
-            setProgress (i / (double) modules.size());
-
-            MemoryBlock downloaded;
-            result = download (m, downloaded);
-
-            if (result.failed() || threadShouldExit())
-                break;
-
-            result = unzip (m, downloaded);
-
-            if (result.failed() || threadShouldExit())
-                break;
-        }
-    }
-
-    Result download (const ModuleDescription& m, MemoryBlock& dest)
-    {
-        setStatusMessage ("Downloading " + m.getID() + "...");
-
-        const ScopedPointer<InputStream> in (m.url.createInputStream (false, nullptr, nullptr, String::empty, 10000));
-
-        if (in != nullptr && in->readIntoMemoryBlock (dest))
-            return Result::ok();
-
-        return Result::fail ("Failed to download from: " + m.url.toString (false));
-    }
-
-    Result unzip (const ModuleDescription& m, const MemoryBlock& data)
-    {
-        setStatusMessage ("Installing " + m.getID() + "...");
-
-        MemoryInputStream input (data, false);
-        ZipFile zip (input);
-
-        if (zip.getNumEntries() == 0)
-            return Result::fail ("The downloaded file wasn't a valid module file!");
-
-        if (! m.getFolder().deleteRecursively())
-            return Result::fail ("Couldn't delete the existing folder:\n" + m.getFolder().getFullPathName());
-
-        return zip.uncompressTo (m.getFolder().getParentDirectory(), true);
-    }
-
-    Result result;
-    Array<ModuleDescription> modules;
-
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DownloadAndInstallThread)
-};
diff --git a/extras/Introjucer/Source/Project/jucer_Project.h b/extras/Introjucer/Source/Project/jucer_Project.h
index cf2a66241e..ef0690e82b 100644
--- a/extras/Introjucer/Source/Project/jucer_Project.h
+++ b/extras/Introjucer/Source/Project/jucer_Project.h
@@ -104,8 +104,10 @@ public:
     Value getProjectUserNotes()                         { return getProjectValue (Ids::userNotes); }
 
     //==============================================================================
-    File getGeneratedCodeFolder() const                 { return getFile().getSiblingFile ("JuceLibraryCode"); }
-    File getAppIncludeFile() const                      { return getGeneratedCodeFolder().getChildFile (getJuceSourceHFilename()); }
+    File getGeneratedCodeFolder() const                         { return getFile().getSiblingFile ("JuceLibraryCode"); }
+    File getLocalModulesFolder() const                          { return getGeneratedCodeFolder().getChildFile ("modules"); }
+    File getLocalModuleFolder (const String& moduleID) const    { return getLocalModulesFolder().getChildFile (moduleID); }
+    File getAppIncludeFile() const                              { return getGeneratedCodeFolder().getChildFile (getJuceSourceHFilename()); }
 
     File getBinaryDataCppFile (int index) const;
     File getBinaryDataHeaderFile() const                { return getBinaryDataCppFile (0).withFileExtension (".h"); }
diff --git a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
index 34191a9118..5f2fbb8c81 100644
--- a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
+++ b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
@@ -27,11 +27,8 @@
 #include "../Application/jucer_MainWindow.h"
 #include "../Application/jucer_Application.h"
 #include "../Code Editor/jucer_SourceCodeEditor.h"
-#include "../Project Saving/jucer_ProjectExporter.h"
-#include "../Utility/jucer_TranslationTool.h"
-#include "../Utility/jucer_JucerTreeViewBase.h"
-#include "../Wizards/jucer_NewFileWizard.h"
-#include "jucer_GroupInformationComponent.h"
+#include "jucer_TreeItemTypes.h"
+
 
 //==============================================================================
 class FileTreePanel   : public TreePanelBase
@@ -41,18 +38,14 @@ public:
         : TreePanelBase (&p, "fileTreeState")
     {
         tree.setMultiSelectEnabled (true);
-        setRoot (new GroupItem (p.getMainGroup()));
+        setRoot (new FileTreeItemTypes::GroupItem (p.getMainGroup()));
     }
 
     void updateMissingFileStatuses()
     {
-        if (ProjectTreeItemBase* p = dynamic_cast<ProjectTreeItemBase*> (rootItem.get()))
+        if (FileTreeItemTypes::ProjectTreeItemBase* p = dynamic_cast<FileTreeItemTypes::ProjectTreeItemBase*> (rootItem.get()))
             p->checkFileStatus();
     }
-
-    #include "jucer_ProjectTree_Base.h"
-    #include "jucer_ProjectTree_Group.h"
-    #include "jucer_ProjectTree_File.h"
 };
 
 //==============================================================================
@@ -63,7 +56,7 @@ public:
         : TreePanelBase (&p, "settingsTreeState")
     {
         tree.setMultiSelectEnabled (false);
-        setRoot (new RootItem (p));
+        setRoot (new ConfigTreeItemTypes::RootItem (p));
 
         if (tree.getNumSelectedItems() == 0)
             tree.getRootItem()->setSelected (true, true);
@@ -99,25 +92,25 @@ public:
 
     void showProjectSettings()
     {
-        if (ConfigTreeItemBase* root = dynamic_cast<ConfigTreeItemBase*> (rootItem.get()))
+        if (ConfigTreeItemTypes::ConfigTreeItemBase* root = dynamic_cast<ConfigTreeItemTypes::ConfigTreeItemBase*> (rootItem.get()))
             if (root->isProjectSettings())
                 root->setSelected (true, true);
     }
 
     void showModules()
     {
-        if (ConfigTreeItemBase* mods = getModulesItem())
+        if (ConfigTreeItemTypes::ConfigTreeItemBase* mods = getModulesItem())
             mods->setSelected (true, true);
     }
 
     void showModule (const String& moduleID)
     {
-        if (ConfigTreeItemBase* mods = getModulesItem())
+        if (ConfigTreeItemTypes::ConfigTreeItemBase* mods = getModulesItem())
         {
             mods->setOpen (true);
 
             for (int i = mods->getNumSubItems(); --i >= 0;)
-                if (ModuleItem* m = dynamic_cast<ModuleItem*> (mods->getSubItem (i)))
+                if (ConfigTreeItemTypes::ModuleItem* m = dynamic_cast<ConfigTreeItemTypes::ModuleItem*> (mods->getSubItem (i)))
                     if (m->moduleID == moduleID)
                         m->setSelected (true, true);
         }
@@ -126,16 +119,11 @@ public:
     TextButton openProjectButton, saveAndOpenButton;
 
 private:
-    #include "jucer_ConfigTree_Base.h"
-    #include "jucer_ConfigTree_Modules.h"
-    #include "jucer_ConfigTree_Exporter.h"
-    #include "jucer_ModulesPanel.h"
-
-    ConfigTreeItemBase* getModulesItem()
+    ConfigTreeItemTypes::ConfigTreeItemBase* getModulesItem()
     {
-        if (ConfigTreeItemBase* root = dynamic_cast<ConfigTreeItemBase*> (rootItem.get()))
+        if (ConfigTreeItemTypes::ConfigTreeItemBase* root = dynamic_cast<ConfigTreeItemTypes::ConfigTreeItemBase*> (rootItem.get()))
             if (root->isProjectSettings())
-                if (ConfigTreeItemBase* mods = dynamic_cast<ConfigTreeItemBase*> (root->getSubItem (0)))
+                if (ConfigTreeItemTypes::ConfigTreeItemBase* mods = dynamic_cast<ConfigTreeItemTypes::ConfigTreeItemBase*> (root->getSubItem (0)))
                     if (mods->isModulesList())
                         return mods;
 
@@ -931,5 +919,5 @@ bool ProjectContentComponent::perform (const InvocationInfo& info)
 void ProjectContentComponent::getSelectedProjectItemsBeingDragged (const DragAndDropTarget::SourceDetails& dragSourceDetails,
                                                                    OwnedArray<Project::Item>& selectedNodes)
 {
-    FileTreePanel::ProjectTreeItemBase::getSelectedProjectItemsBeingDragged (dragSourceDetails, selectedNodes);
+    FileTreeItemTypes::ProjectTreeItemBase::getSelectedProjectItemsBeingDragged (dragSourceDetails, selectedNodes);
 }
diff --git a/extras/Introjucer/Source/Project/jucer_TreeItemTypes.h b/extras/Introjucer/Source/Project/jucer_TreeItemTypes.h
new file mode 100644
index 0000000000..e39030bbd2
--- /dev/null
+++ b/extras/Introjucer/Source/Project/jucer_TreeItemTypes.h
@@ -0,0 +1,51 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library.
+   Copyright (c) 2013 - Raw Material Software Ltd.
+
+   Permission is granted to use this software under the terms of either:
+   a) the GPL v2 (or any later version)
+   b) the Affero GPL v3
+
+   Details of these licenses can be found at: www.gnu.org/licenses
+
+   JUCE 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.
+
+   ------------------------------------------------------------------------------
+
+   To release a closed-source product which uses JUCE, commercial licenses are
+   available: visit www.juce.com for more information.
+
+  ==============================================================================
+*/
+
+#ifndef JUCER_TREEITEMTYPES_H_INCLUDED
+#define JUCER_TREEITEMTYPES_H_INCLUDED
+
+#include "../Project Saving/jucer_ProjectExporter.h"
+#include "../Utility/jucer_TranslationTool.h"
+#include "../Utility/jucer_JucerTreeViewBase.h"
+#include "../Wizards/jucer_NewFileWizard.h"
+#include "jucer_GroupInformationComponent.h"
+#include "jucer_ModulesPanel.h"
+
+
+struct FileTreeItemTypes
+{
+    #include "jucer_ProjectTree_Base.h"
+    #include "jucer_ProjectTree_Group.h"
+    #include "jucer_ProjectTree_File.h"
+};
+
+struct ConfigTreeItemTypes
+{
+    #include "jucer_ConfigTree_Base.h"
+    #include "jucer_ConfigTree_Modules.h"
+    #include "jucer_ConfigTree_Exporter.h"
+};
+
+
+#endif  // JUCER_TREEITEMTYPES_H_INCLUDED