reorganize files in interface directory

interface/CMakeLists.txt

@@ -48,7 +48,7 @@ configure_file(InterfaceVersion.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceVe
 
 # grab the implementation and header files from src dirs
 file(GLOB INTERFACE_SRCS src/*.cpp src/*.h)
-foreach(SUBDIR avatar devices renderer ui starfield location)
+foreach(SUBDIR avatar devices renderer ui starfield location scripting)
   file(GLOB_RECURSE SUBDIR_SRCS src/${SUBDIR}/*.cpp src/${SUBDIR}/*.h)
   set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}")
 endforeach(SUBDIR)

interface/src/Application.cpp

@@ -65,17 +65,19 @@
 #include <FstReader.h>
 
 #include "Application.h"
-#include "ClipboardScriptingInterface.h"
 #include "InterfaceVersion.h"
 #include "Menu.h"
-#include "MenuScriptingInterface.h"
 #include "Util.h"
 #include "devices/OculusManager.h"
 #include "devices/TV3DManager.h"
 #include "renderer/ProgramObject.h"
-#include "ui/TextRenderer.h"
-#include "InfoView.h"
+
+#include "scripting/ClipboardScriptingInterface.h"
+#include "scripting/MenuScriptingInterface.h"
+
+#include "ui/InfoView.h"
 #include "ui/Snapshot.h"
+#include "ui/TextRenderer.h"
 
 using namespace std;
 

interface/src/Application.h

@@ -29,12 +29,12 @@
 #include <ParticleEditPacketSender.h>
 #include <ScriptEngine.h>
 #include <OctreeQuery.h>
+#include <ViewFrustum.h>
+#include <VoxelEditPacketSender.h>
 
 #include "Audio.h"
-#include "BandwidthMeter.h"
 #include "BuckyBalls.h"
 #include "Camera.h"
-#include "ControllerScriptingInterface.h"
 #include "DatagramProcessor.h"
 #include "Environment.h"
 #include "FileLogger.h"
@@ -44,9 +44,7 @@
 #include "PacketHeaders.h"
 #include "ParticleTreeRenderer.h"
 #include "Stars.h"
-#include "ViewFrustum.h"
 #include "VoxelFade.h"
-#include "VoxelEditPacketSender.h"
 #include "VoxelHideShowThread.h"
 #include "VoxelPacketProcessor.h"
 #include "VoxelSystem.h"
@@ -63,13 +61,15 @@
 #include "renderer/PointShader.h"
 #include "renderer/TextureCache.h"
 #include "renderer/VoxelShader.h"
+#include "scripting/ControllerScriptingInterface.h"
 #include "ui/BandwidthDialog.h"
+#include "ui/BandwidthMeter.h"
 #include "ui/OctreeStatsDialog.h"
 #include "ui/RearMirrorTools.h"
 #include "ui/LodToolsDialog.h"
 #include "ui/LogDialog.h"
 #include "ui/UpdateDialog.h"
-#include "ui/Overlays.h"
+#include "ui/overlays/Overlays.h"
 
 
 class QAction;

interface/src/Audio.h

@@ -27,7 +27,7 @@
 #include <AudioRingBuffer.h>
 #include <StdDev.h>
 
-#include "Oscilloscope.h"
+#include "ui/Oscilloscope.h"
 
 #include <QGLWidget>
 

interface/src/Menu.cpp

@@ -33,11 +33,11 @@
 
 #include "Application.h"
 #include "Menu.h"
-#include "MenuScriptingInterface.h"
+#include "scripting/MenuScriptingInterface.h"
 #include "Util.h"
-#include "InfoView.h"
+#include "ui/InfoView.h"
 #include "ui/MetavoxelEditor.h"
-#include "ModelBrowser.h"
+#include "ui/ModelBrowser.h"
 
 
 Menu* Menu::_instance = NULL;

interface/src/VoxelImporter.h

@@ -9,12 +9,13 @@
 #ifndef __hifi__VoxelImporter__
 #define __hifi__VoxelImporter__
 
-#include <VoxelSystem.h>
-#include <ImportDialog.h>
-
 #include <QThread>
 #include <QRunnable>
 
+#include <VoxelSystem.h>
+
+#include "ui/ImportDialog.h"
+
 class ImportTask;
 
 class VoxelImporter : public QObject {

interface/src/ui/overlays/Base3DOverlay.cpp

@@ -12,7 +12,6 @@
 #include <SharedUtil.h>
 
 #include "Base3DOverlay.h"
-#include "TextRenderer.h"
 
 const glm::vec3 DEFAULT_POSITION = glm::vec3(0.0f, 0.0f, 0.0f);
 const float DEFAULT_LINE_WIDTH = 1.0f;

interface/src/ui/overlays/TextOverlay.cpp

@@ -12,7 +12,7 @@
 #include <SharedUtil.h>
 
 #include "TextOverlay.h"
-#include "TextRenderer.h"
+#include "ui/TextRenderer.h"
 
 TextOverlay::TextOverlay() :
     _leftMargin(DEFAULT_MARGIN),