diff --git a/trick_sims/SIM_satellite/RUN_test/input.py b/trick_sims/SIM_satellite/RUN_test/input.py
index abb37a82..772a3f70 100644
--- a/trick_sims/SIM_satellite/RUN_test/input.py
+++ b/trick_sims/SIM_satellite/RUN_test/input.py
@@ -5,7 +5,7 @@ execfile("Modified_data/realtime.py")
 
 dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 18)
 
-scene_app_path = os.environ['TRICK_HOME'] + '/trick_models/Satellite/graphics/Scene'
+scene_app_path = 'models/Satellite/graphics/Scene'
 if os.path.exists(scene_app_path):
     dyn.sat_graph_comm.syscmd = scene_app_path + ' &'
 else:
diff --git a/trick_sims/SIM_satellite/S_overrides.mk b/trick_sims/SIM_satellite/S_overrides.mk
index 53c0139a..b485e6dd 100644
--- a/trick_sims/SIM_satellite/S_overrides.mk
+++ b/trick_sims/SIM_satellite/S_overrides.mk
@@ -1,3 +1,3 @@
 
-TRICK_CFLAGS += -I${TRICK_HOME}/trick_models
-TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models
+TRICK_CFLAGS += -I${TRICK_HOME}/trick_models -Imodels
+TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models -Imodels
diff --git a/trick_models/Satellite/graphics/Ball.c b/trick_sims/SIM_satellite/models/Satellite/graphics/Ball.c
similarity index 100%
rename from trick_models/Satellite/graphics/Ball.c
rename to trick_sims/SIM_satellite/models/Satellite/graphics/Ball.c
diff --git a/trick_models/Satellite/graphics/Camera.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.cpp
similarity index 100%
rename from trick_models/Satellite/graphics/Camera.cpp
rename to trick_sims/SIM_satellite/models/Satellite/graphics/Camera.cpp
diff --git a/trick_models/Satellite/graphics/Camera.hh b/trick_sims/SIM_satellite/models/Satellite/graphics/Camera.hh
similarity index 100%
rename from trick_models/Satellite/graphics/Camera.hh
rename to trick_sims/SIM_satellite/models/Satellite/graphics/Camera.hh
diff --git a/trick_models/Satellite/graphics/GraphicsModels.h b/trick_sims/SIM_satellite/models/Satellite/graphics/GraphicsModels.h
similarity index 100%
rename from trick_models/Satellite/graphics/GraphicsModels.h
rename to trick_sims/SIM_satellite/models/Satellite/graphics/GraphicsModels.h
diff --git a/trick_models/Satellite/graphics/SatelliteModel.c b/trick_sims/SIM_satellite/models/Satellite/graphics/SatelliteModel.c
similarity index 100%
rename from trick_models/Satellite/graphics/SatelliteModel.c
rename to trick_sims/SIM_satellite/models/Satellite/graphics/SatelliteModel.c
diff --git a/trick_models/Satellite/graphics/Scene.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
similarity index 98%
rename from trick_models/Satellite/graphics/Scene.cpp
rename to trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
index 35131232..5a19042b 100644
--- a/trick_models/Satellite/graphics/Scene.cpp
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.cpp
@@ -6,8 +6,8 @@
 #include "Scene.hh"
 #include <iostream>
 #include <vector>
-#include "trick_utils/comm/include/tc_proto.h"
-#include "trick_utils/math/include/vector_macros.h"
+#include "trick/tc_proto.h"
+#include "trick/vector_macros.h"
 #include <stdio.h>
 
 #ifndef PI
diff --git a/trick_models/Satellite/graphics/Scene.hh b/trick_sims/SIM_satellite/models/Satellite/graphics/Scene.hh
similarity index 100%
rename from trick_models/Satellite/graphics/Scene.hh
rename to trick_sims/SIM_satellite/models/Satellite/graphics/Scene.hh
diff --git a/trick_models/Satellite/graphics/SceneElement.cpp b/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
similarity index 100%
rename from trick_models/Satellite/graphics/SceneElement.cpp
rename to trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.cpp
diff --git a/trick_models/Satellite/graphics/SceneElement.hh b/trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.hh
similarity index 100%
rename from trick_models/Satellite/graphics/SceneElement.hh
rename to trick_sims/SIM_satellite/models/Satellite/graphics/SceneElement.hh
diff --git a/trick_models/Satellite/graphics/capsule_texture.i b/trick_sims/SIM_satellite/models/Satellite/graphics/capsule_texture.i
similarity index 100%
rename from trick_models/Satellite/graphics/capsule_texture.i
rename to trick_sims/SIM_satellite/models/Satellite/graphics/capsule_texture.i
diff --git a/trick_models/Satellite/graphics/earth_texture.i b/trick_sims/SIM_satellite/models/Satellite/graphics/earth_texture.i
similarity index 100%
rename from trick_models/Satellite/graphics/earth_texture.i
rename to trick_sims/SIM_satellite/models/Satellite/graphics/earth_texture.i
diff --git a/trick_models/Satellite/graphics/makefile b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile
similarity index 62%
rename from trick_models/Satellite/graphics/makefile
rename to trick_sims/SIM_satellite/models/Satellite/graphics/makefile
index 8515bf6f..53e31321 100644
--- a/trick_models/Satellite/graphics/makefile
+++ b/trick_sims/SIM_satellite/models/Satellite/graphics/makefile
@@ -1,18 +1,17 @@
-include ${TRICK_HOME}/makefiles/Makefile.common
 CPP      = g++
 CC       = gcc
 
-ifeq ($(TRICK_HOST_TYPE), Darwin)
+ifeq ($(shell uname), Darwin)
        GL_LIBS  = -framework GLUT -framework OpenGL
-       TC_LIBS = -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} -ltrick_comm 
-       LDFLAGS = 
+       TC_LIBS = -L${TRICK_HOME}/lib -ltrick_comm
+       LDFLAGS =
 else
        GL_LIBS  = -lGL -lGLU -lglut
-       TC_LIBS = -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} -ltrick_comm -lrt
+       TC_LIBS = -L${TRICK_HOME}/lib -ltrick_comm -lrt
        LDFLAGS = -Wl,--export-dynamic
 endif
 
-CFLAGS = -I${TRICK_HOME}/trick_source
+CFLAGS = -I${TRICK_HOME}/include
 
 MAIN     = Scene
 
@@ -23,6 +22,7 @@ OBJECTS = Camera.o Scene.o SceneElement.o SatelliteModel.o Ball.o
 
 .cpp.o:
 	${CPP} ${CFLAGS} ${INCDIRS} -c $<
+	echo $(NARF)
 
 all: Scene
 
diff --git a/trick_models/Satellite/graphics/nozzle_texture.i b/trick_sims/SIM_satellite/models/Satellite/graphics/nozzle_texture.i
similarity index 100%
rename from trick_models/Satellite/graphics/nozzle_texture.i
rename to trick_sims/SIM_satellite/models/Satellite/graphics/nozzle_texture.i
diff --git a/trick_models/Satellite/include/Planet.hh b/trick_sims/SIM_satellite/models/Satellite/include/Planet.hh
similarity index 100%
rename from trick_models/Satellite/include/Planet.hh
rename to trick_sims/SIM_satellite/models/Satellite/include/Planet.hh
diff --git a/trick_models/Satellite/include/SatGraphicsComm.hh b/trick_sims/SIM_satellite/models/Satellite/include/SatGraphicsComm.hh
similarity index 100%
rename from trick_models/Satellite/include/SatGraphicsComm.hh
rename to trick_sims/SIM_satellite/models/Satellite/include/SatGraphicsComm.hh
diff --git a/trick_models/Satellite/include/Satellite.hh b/trick_sims/SIM_satellite/models/Satellite/include/Satellite.hh
similarity index 100%
rename from trick_models/Satellite/include/Satellite.hh
rename to trick_sims/SIM_satellite/models/Satellite/include/Satellite.hh
diff --git a/trick_models/Satellite/include/Thruster.hh b/trick_sims/SIM_satellite/models/Satellite/include/Thruster.hh
similarity index 100%
rename from trick_models/Satellite/include/Thruster.hh
rename to trick_sims/SIM_satellite/models/Satellite/include/Thruster.hh
diff --git a/trick_models/Satellite/src/Planet.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
similarity index 100%
rename from trick_models/Satellite/src/Planet.cpp
rename to trick_sims/SIM_satellite/models/Satellite/src/Planet.cpp
diff --git a/trick_models/Satellite/src/SatGraphicsComm.cpp b/trick_sims/SIM_satellite/models/Satellite/src/SatGraphicsComm.cpp
similarity index 100%
rename from trick_models/Satellite/src/SatGraphicsComm.cpp
rename to trick_sims/SIM_satellite/models/Satellite/src/SatGraphicsComm.cpp
diff --git a/trick_models/Satellite/src/Satellite.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Satellite.cpp
similarity index 100%
rename from trick_models/Satellite/src/Satellite.cpp
rename to trick_sims/SIM_satellite/models/Satellite/src/Satellite.cpp
diff --git a/trick_models/Satellite/src/Thruster.cpp b/trick_sims/SIM_satellite/models/Satellite/src/Thruster.cpp
similarity index 100%
rename from trick_models/Satellite/src/Thruster.cpp
rename to trick_sims/SIM_satellite/models/Satellite/src/Thruster.cpp
diff --git a/trick_models/Wheelbot/Graphics/.gitignore b/trick_sims/SIM_wheelbot/models/Graphics/.gitignore
similarity index 100%
rename from trick_models/Wheelbot/Graphics/.gitignore
rename to trick_sims/SIM_wheelbot/models/Graphics/.gitignore