diff --git a/trick_sims/SIM_sun/S_define b/trick_sims/SIM_sun/S_define
index 7993f7b9..20659778 100644
--- a/trick_sims/SIM_sun/S_define
+++ b/trick_sims/SIM_sun/S_define
@@ -3,23 +3,23 @@ PURPOSE:
     (This comment lists out the other object files that are not included from c++ headers)
 LIBRARY DEPENDENCIES:
     (
-     (helios/src/JD.c)
-     (helios/src/lh_coords.c)
-     (helios/src/sidereal.c)
-     (helios/src/sun_pos.c)
-     (helios/src/sun_pred_cyclic.c)
-     (helios/src/sun_pred_default_data.c)
-     (helios/src/sun_pred_fast_display.c)
-     (helios/src/sun_pred_init.c)
-     (helios/src/sun_pred_shutdown.c)
-     (helios/src/sun_pred_slow_display.c)
+     (Sun/src/JD.c)
+     (Sun/src/lh_coords.c)
+     (Sun/src/sidereal.c)
+     (Sun/src/sun_pos.c)
+     (Sun/src/sun_pred_cyclic.c)
+     (Sun/src/sun_pred_default_data.c)
+     (Sun/src/sun_pred_fast_display.c)
+     (Sun/src/sun_pred_init.c)
+     (Sun/src/sun_pred_shutdown.c)
+     (Sun/src/sun_pred_slow_display.c)
     )
 *************************************************************/
 
 #include "sim_objects/default_trick_sys.sm"
 
 
-##include "helios/include/sun_pred.h"
+##include "Sun/include/sun_pred.h"
 ##include "sim_services/MemoryManager/include/wcs_ext.h"
 
 //=============================================================================
diff --git a/trick_sims/SIM_sun/S_overrides.mk b/trick_sims/SIM_sun/S_overrides.mk
index 8fa02be5..29f4dbe3 100644
--- a/trick_sims/SIM_sun/S_overrides.mk
+++ b/trick_sims/SIM_sun/S_overrides.mk
@@ -1,4 +1,4 @@
 
-TRICK_CFLAGS += -I${TRICK_HOME}/trick_models
-TRICK_CXXFLAGS += -I${TRICK_HOME}/trick_models
+TRICK_CFLAGS += -Imodels
+TRICK_CXXFLAGS += -Imodels
 
diff --git a/trick_models/helios/include/JD.h b/trick_sims/SIM_sun/models/Sun/include/JD.h
similarity index 100%
rename from trick_models/helios/include/JD.h
rename to trick_sims/SIM_sun/models/Sun/include/JD.h
diff --git a/trick_models/helios/include/lh_coords.h b/trick_sims/SIM_sun/models/Sun/include/lh_coords.h
similarity index 100%
rename from trick_models/helios/include/lh_coords.h
rename to trick_sims/SIM_sun/models/Sun/include/lh_coords.h
diff --git a/trick_models/helios/include/sidereal.h b/trick_sims/SIM_sun/models/Sun/include/sidereal.h
similarity index 100%
rename from trick_models/helios/include/sidereal.h
rename to trick_sims/SIM_sun/models/Sun/include/sidereal.h
diff --git a/trick_models/helios/include/sun_pos.h b/trick_sims/SIM_sun/models/Sun/include/sun_pos.h
similarity index 100%
rename from trick_models/helios/include/sun_pos.h
rename to trick_sims/SIM_sun/models/Sun/include/sun_pos.h
diff --git a/trick_models/helios/include/sun_pred.h b/trick_sims/SIM_sun/models/Sun/include/sun_pred.h
similarity index 100%
rename from trick_models/helios/include/sun_pred.h
rename to trick_sims/SIM_sun/models/Sun/include/sun_pred.h
diff --git a/trick_models/helios/src/JD.c b/trick_sims/SIM_sun/models/Sun/src/JD.c
similarity index 100%
rename from trick_models/helios/src/JD.c
rename to trick_sims/SIM_sun/models/Sun/src/JD.c
diff --git a/trick_models/helios/src/lh_coords.c b/trick_sims/SIM_sun/models/Sun/src/lh_coords.c
similarity index 100%
rename from trick_models/helios/src/lh_coords.c
rename to trick_sims/SIM_sun/models/Sun/src/lh_coords.c
diff --git a/trick_models/helios/src/sidereal.c b/trick_sims/SIM_sun/models/Sun/src/sidereal.c
similarity index 100%
rename from trick_models/helios/src/sidereal.c
rename to trick_sims/SIM_sun/models/Sun/src/sidereal.c
diff --git a/trick_models/helios/src/sun_pos.c b/trick_sims/SIM_sun/models/Sun/src/sun_pos.c
similarity index 100%
rename from trick_models/helios/src/sun_pos.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pos.c
diff --git a/trick_models/helios/src/sun_pred_cyclic.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_cyclic.c
similarity index 100%
rename from trick_models/helios/src/sun_pred_cyclic.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pred_cyclic.c
diff --git a/trick_models/helios/src/sun_pred_default_data.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_default_data.c
similarity index 100%
rename from trick_models/helios/src/sun_pred_default_data.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pred_default_data.c
diff --git a/trick_models/helios/src/sun_pred_fast_display.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_fast_display.c
similarity index 100%
rename from trick_models/helios/src/sun_pred_fast_display.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pred_fast_display.c
diff --git a/trick_models/helios/src/sun_pred_init.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_init.c
similarity index 100%
rename from trick_models/helios/src/sun_pred_init.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pred_init.c
diff --git a/trick_models/helios/src/sun_pred_shutdown.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_shutdown.c
similarity index 100%
rename from trick_models/helios/src/sun_pred_shutdown.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pred_shutdown.c
diff --git a/trick_models/helios/src/sun_pred_slow_display.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_slow_display.c
similarity index 100%
rename from trick_models/helios/src/sun_pred_slow_display.c
rename to trick_sims/SIM_sun/models/Sun/src/sun_pred_slow_display.c