diff --git a/calit2/GML/GML.h b/calit2/GML/GML.h
index 67c467da..43774781 100755
--- a/calit2/GML/GML.h
+++ b/calit2/GML/GML.h
@@ -6,7 +6,7 @@
 
 // CVR
 #include <cvrKernel/CVRPlugin.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 #include <cvrKernel/SceneManager.h>
 #include <cvrKernel/Navigation.h>
 #include <cvrKernel/PluginHelper.h>
diff --git a/calit2/ImageViewer/ImageObject.cpp b/calit2/ImageViewer/ImageObject.cpp
index 56273b7a..fe90494b 100644
--- a/calit2/ImageViewer/ImageObject.cpp
+++ b/calit2/ImageViewer/ImageObject.cpp
@@ -1,7 +1,7 @@
 #include "ImageObject.h"
 
 #include <cvrKernel/NodeMask.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 
 #include <osgDB/ReadFile>
 
diff --git a/calit2/MVSim/MVSim.h b/calit2/MVSim/MVSim.h
index 00a85c81..a0e7d7ad 100755
--- a/calit2/MVSim/MVSim.h
+++ b/calit2/MVSim/MVSim.h
@@ -2,8 +2,8 @@
 #define _MVSIM_H_
 
 #include <cvrKernel/CVRPlugin.h>
-#include <cvrKernel/ScreenMVMaster.h>
-#include <cvrKernel/ScreenMVSimulator.h>
+#include <cvrKernel/Screens/ScreenMVMaster.h>
+#include <cvrKernel/Screens/ScreenMVSimulator.h>
 #include <cvrMenu/MenuButton.h>
 #include <cvrMenu/SubMenu.h>
 #include <cvrMenu/MenuCheckbox.h>
diff --git a/calit2/ModelLoader/ModelLoader.cpp b/calit2/ModelLoader/ModelLoader.cpp
index 5c9e92ab..caada26b 100644
--- a/calit2/ModelLoader/ModelLoader.cpp
+++ b/calit2/ModelLoader/ModelLoader.cpp
@@ -37,7 +37,7 @@ using namespace cvr;
 
 CVRPLUGIN(ModelLoader)
 
-ModelLoader::ModelLoader() : FileLoadCallback("iv,wrl,vrml,obj,osg,earth")
+ModelLoader::ModelLoader() : FileLoadCallback("iv,wrl,vrml,obj,osg,earth,3ds")
 {
 }
 
@@ -622,7 +622,7 @@ void ModelLoader::message(int type, char * &data, bool collaborative)
     }
 }
 
-bool ModelLoader::loadFile(std::string file)
+SceneObject* ModelLoader::loadFile(std::string file)
 {
     std::cerr << "ModelLoader: Loading file: " << file << std::endl;
 
@@ -630,7 +630,7 @@ bool ModelLoader::loadFile(std::string file)
     if(modelNode==NULL)
     {
 	cerr << "ModelLoader: Error reading file " << file << endl;
-	return false;
+	return NULL;
     }
     else
     {
@@ -661,30 +661,12 @@ bool ModelLoader::loadFile(std::string file)
     modelNode->accept(tr2v);
 
     SceneObject * so = new SceneObject(name,false,false,false,true,false);
-    PluginHelper::registerSceneObject(so,"ModelLoader");
-    osg::Switch * sNode = new osg::Switch();
-    sNode->addChild(modelNode);
-    so->addChild(sNode);
-    so->attachToScene();
+    so->addChild(modelNode);
     so->setNavigationOn(true);
     so->addMoveMenuItem();
     so->addNavigationMenuItem();
 
-    MenuButton * mb;
-
-    mb = new MenuButton("Reset Position");
-    mb->setCallback(this);
-    so->addMenuItem(mb);
-    _resetMap[so] = mb;
-
-    mb = new MenuButton("Delete");
-    mb->setCallback(this);
-    so->addMenuItem(mb);
-    _deleteMap[so] = mb;
-
-    _loadedObjects.push_back(so);
-
-    return true;
+    return so;
 }
 
 void ModelLoader::writeConfigFile()
diff --git a/calit2/ModelLoader/ModelLoader.h b/calit2/ModelLoader/ModelLoader.h
index a86e508a..5aaa3d45 100644
--- a/calit2/ModelLoader/ModelLoader.h
+++ b/calit2/ModelLoader/ModelLoader.h
@@ -36,7 +36,7 @@ class ModelLoader : public cvr::MenuCallback, public cvr::CVRPlugin, public cvr:
         void preFrame();
 
         virtual void message(int type, char * &data, bool collaborative=false);
-        virtual bool loadFile(std::string file);
+        virtual cvr::SceneObject* loadFile(std::string file);
 
     protected:
         cvr::SubMenu * MLMenu, * loadMenu;
diff --git a/calit2/MultiViewSimulator/MultiViewSimulator.cpp b/calit2/MultiViewSimulator/MultiViewSimulator.cpp
index bdb8c190..3cbcf27f 100755
--- a/calit2/MultiViewSimulator/MultiViewSimulator.cpp
+++ b/calit2/MultiViewSimulator/MultiViewSimulator.cpp
@@ -5,7 +5,7 @@
 #include <cvrConfig/ConfigManager.h>
 #include <cvrKernel/InteractionManager.h>
 #include <cvrKernel/PluginHelper.h>
-#include <cvrKernel/ScreenMultiViewer2.h>
+#include <cvrKernel/Screens/Screens/ScreenMultiViewer2.h>
 #include <cvrMenu/MenuSystem.h>
 
 #include <osg/ShapeDrawable>
diff --git a/calit2/OssimPlanet/OssimPlanet.h b/calit2/OssimPlanet/OssimPlanet.h
index 41120d46..1e07b7c9 100644
--- a/calit2/OssimPlanet/OssimPlanet.h
+++ b/calit2/OssimPlanet/OssimPlanet.h
@@ -54,7 +54,7 @@
 #include <cvrKernel/PluginHelper.h>
 
 #include <cvrKernel/CVRPlugin.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/Screens/ScreenBase.h>
 #include <cvrKernel/SceneManager.h>
 #include <cvrKernel/Navigation.h>
 #include <cvrKernel/ComController.h>
diff --git a/calit2/PanoView360/PanoDrawable.cpp b/calit2/PanoView360/PanoDrawable.cpp
index efa73106..9c033840 100644
--- a/calit2/PanoView360/PanoDrawable.cpp
+++ b/calit2/PanoView360/PanoDrawable.cpp
@@ -2,7 +2,7 @@
 
 #include <cvrConfig/ConfigManager.h>
 #include <cvrKernel/ScreenConfig.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 #include <cvrKernel/ComController.h>
 #include <cvrKernel/NodeMask.h>
 
diff --git a/calit2/PanoViewLOD/PanoDrawableLOD.cpp b/calit2/PanoViewLOD/PanoDrawableLOD.cpp
index 08eedefa..31a8a378 100644
--- a/calit2/PanoViewLOD/PanoDrawableLOD.cpp
+++ b/calit2/PanoViewLOD/PanoDrawableLOD.cpp
@@ -4,7 +4,7 @@
 #include <cvrKernel/NodeMask.h>
 #include <cvrKernel/ScreenConfig.h>
 #include <cvrKernel/PluginHelper.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 
 #include <osg/GraphicsContext>
 
diff --git a/calit2/Points/Points.h b/calit2/Points/Points.h
index f5f7b576..e9d058ba 100755
--- a/calit2/Points/Points.h
+++ b/calit2/Points/Points.h
@@ -8,7 +8,7 @@
 
 // CVR
 #include <cvrKernel/CVRPlugin.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 #include <cvrKernel/SceneManager.h>
 #include <cvrKernel/SceneObject.h>
 #include <cvrKernel/Navigation.h>
diff --git a/calit2/SMV2Settings/SMV2Settings.cpp b/calit2/SMV2Settings/SMV2Settings.cpp
index 363a8015..a81b8185 100755
--- a/calit2/SMV2Settings/SMV2Settings.cpp
+++ b/calit2/SMV2Settings/SMV2Settings.cpp
@@ -6,7 +6,7 @@
 #include <cvrKernel/InteractionManager.h>
 #include <cvrKernel/PluginHelper.h>
 #include <cvrKernel/ScreenConfig.h>
-#include <cvrKernel/ScreenMVZones.h>
+#include <cvrKernel/Screens/ScreenMVZones.h>
 #include <cvrMenu/MenuSystem.h>
 
 #include <osg/ShapeDrawable>
diff --git a/calit2/SMV2Settings/SMV2Settings.h b/calit2/SMV2Settings/SMV2Settings.h
index a65bb5ff..cd8da141 100644
--- a/calit2/SMV2Settings/SMV2Settings.h
+++ b/calit2/SMV2Settings/SMV2Settings.h
@@ -2,7 +2,7 @@
 #define SMV2SETTINGS
 
 #include <cvrKernel/CVRPlugin.h>
-#include <cvrKernel/ScreenMVSimulator.h>
+#include <cvrKernel/Screens/ScreenMVSimulator.h>
 #include <cvrMenu/MenuButton.h>
 #include <cvrMenu/SubMenu.h>
 #include <cvrMenu/MenuCheckbox.h>
diff --git a/calit2/Site/Site.cpp b/calit2/Site/Site.cpp
index 00361314..22141c80 100644
--- a/calit2/Site/Site.cpp
+++ b/calit2/Site/Site.cpp
@@ -12,7 +12,7 @@
 #include <cvrConfig/ConfigManager.h>
 #include <cvrKernel/CVRPlugin.h>
 #include <cvrKernel/PluginHelper.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 #include <cvrKernel/SceneManager.h>
 #include <cvrKernel/Navigation.h>
 #include <cvrKernel/ComController.h>
diff --git a/calit2/Site/Site.h b/calit2/Site/Site.h
index 90eacab1..190bd91c 100644
--- a/calit2/Site/Site.h
+++ b/calit2/Site/Site.h
@@ -16,7 +16,7 @@
 
 #include <cvrKernel/CVRPlugin.h>
 #include <cvrKernel/FileHandler.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 #include <cvrKernel/SceneManager.h>
 #include <cvrKernel/Navigation.h>
 #include <cvrKernel/ComController.h>
diff --git a/general/MenuBasics/MenuBasics.cpp b/general/MenuBasics/MenuBasics.cpp
index 554d48ef..a5fe5828 100644
--- a/general/MenuBasics/MenuBasics.cpp
+++ b/general/MenuBasics/MenuBasics.cpp
@@ -5,7 +5,7 @@
 #include <cvrKernel/CVRViewer.h>
 #include <cvrKernel/ScreenConfig.h>
 #include <cvrKernel/ComController.h>
-#include <cvrKernel/ScreenBase.h>
+#include <cvrKernel/Screens/ScreenBase.h>
 #include <cvrInput/TrackingManager.h>
 #include <cvrMenu/MenuSystem.h>
 #include <cvrConfig/ConfigManager.h>