diff --git a/trick_sims/Cannon/SIM_cannon_dt/Modified_data/cannon.dr b/trick_sims/Cannon/SIM_cannon_dt/Modified_data/cannon.dr
deleted file mode 100644
index 8810bedd..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/Modified_data/cannon.dr
+++ /dev/null
@@ -1,17 +0,0 @@
-global DR_GROUP_ID
-global drg
-try:
- if DR_GROUP_ID >= 0:
- DR_GROUP_ID += 1
-except NameError:
- DR_GROUP_ID = 0
- drg = []
-
-drg.append(trick.DRAscii("cannon"))
-drg[DR_GROUP_ID].set_freq(trick.DR_Always)
-drg[DR_GROUP_ID].set_cycle(0.01)
-drg[DR_GROUP_ID].set_single_prec_only(False)
-drg[DR_GROUP_ID].add_variable("dyn.cannon.pos[0]")
-drg[DR_GROUP_ID].add_variable("dyn.cannon.pos[1]")
-trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer)
-drg[DR_GROUP_ID].enable()
diff --git a/trick_sims/Cannon/SIM_cannon_dt/Modified_data/realtime.py b/trick_sims/Cannon/SIM_cannon_dt/Modified_data/realtime.py
deleted file mode 100644
index e8ce8380..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/Modified_data/realtime.py
+++ /dev/null
@@ -1,11 +0,0 @@
-
-trick.frame_log_on()
-trick.real_time_enable()
-trick.exec_set_software_frame(0.1)
-trick.itimer_enable()
-
-trick.exec_set_enable_freeze(True)
-trick.exec_set_freeze_command(True)
-
-simControlPanel = trick.SimControlPanel()
-trick.add_external_application(simControlPanel)
diff --git a/trick_sims/Cannon/SIM_cannon_dt/RUN_test/input.py b/trick_sims/Cannon/SIM_cannon_dt/RUN_test/input.py
deleted file mode 100644
index 0c47ad16..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/RUN_test/input.py
+++ /dev/null
@@ -1,5 +0,0 @@
-
-execfile("Modified_data/realtime.py")
-execfile("Modified_data/cannon.dr")
-
-trick.exec_set_terminate_time(5.2)
diff --git a/trick_sims/Cannon/SIM_cannon_dt/RUN_test/unit_test.py b/trick_sims/Cannon/SIM_cannon_dt/RUN_test/unit_test.py
deleted file mode 100644
index 36018ab9..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/RUN_test/unit_test.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-trick.exec_set_terminate_time(5.2)
diff --git a/trick_sims/Cannon/SIM_cannon_dt/S_define b/trick_sims/Cannon/SIM_cannon_dt/S_define
deleted file mode 100644
index 5a40072f..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/S_define
+++ /dev/null
@@ -1,34 +0,0 @@
-/************************TRICK HEADER*************************
-PURPOSE:
- (This S_define is used with the RUN_dt input file)
-LIBRARY_DEPENDENCY:
- (
- (cannon/gravity/src/cannon_dt.c)
- (cannon/gravity/src/cannon_init.c)
- (cannon/gravity/src/cannon_default_data.c)
- )
-*************************************************************/
-
-#include "sim_objects/default_trick_sys.sm"
-
-
-##include "cannon/gravity/include/cannon.h"
-##include "cannon/gravity/include/cannon_dt_proto.h"
-
-class CannonSimObject : public Trick::SimObject {
-
- public:
- CANNON cannon ;
-
- CannonSimObject() {
- ("default_data") cannon_default_data( &cannon ) ;
-
- ("initialization") cannon_init( &cannon ) ;
-
- (0.01, "scheduled") cannon_dt( &cannon ) ;
- }
-
-} ;
-
-// Instantiations
-CannonSimObject dyn ;
diff --git a/trick_sims/Cannon/SIM_cannon_dt/S_overrides.mk b/trick_sims/Cannon/SIM_cannon_dt/S_overrides.mk
deleted file mode 100644
index a2eff6d4..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/S_overrides.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-TRICK_CFLAGS += -I../models
-TRICK_CXXFLAGS += -I../models
-
diff --git a/trick_sims/Cannon/SIM_cannon_dt/cannon.sc b/trick_sims/Cannon/SIM_cannon_dt/cannon.sc
deleted file mode 100644
index 4ccfec5b..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/cannon.sc
+++ /dev/null
@@ -1,9 +0,0 @@
-Stripchart:
- title = "Cannon Trajectory"
- geometry = 800x800+300+0
- x_min = 0.0
- x_max = 250.0
- y_min = 0.0
- y_max = 40.0
- x_variable = dyn.cannon.pos[0]
- dyn.cannon.pos[1]
diff --git a/trick_sims/Cannon/SIM_cannon_dt/cannon.tv b/trick_sims/Cannon/SIM_cannon_dt/cannon.tv
deleted file mode 100644
index 578ced82..00000000
--- a/trick_sims/Cannon/SIM_cannon_dt/cannon.tv
+++ /dev/null
@@ -1,3 +0,0 @@
-dyn.baseball.pos[0] 16 m NUMBER
-dyn.baseball.pos[1] 0.1 m NUMBER
-dyn.baseball.pos[2] 2 m NUMBER
diff --git a/trick_sims/Cannon/SIM_cannon_integ/Modified_data/cannon.dr b/trick_sims/Cannon/SIM_cannon_integ/Modified_data/cannon.dr
deleted file mode 100644
index 8810bedd..00000000
--- a/trick_sims/Cannon/SIM_cannon_integ/Modified_data/cannon.dr
+++ /dev/null
@@ -1,17 +0,0 @@
-global DR_GROUP_ID
-global drg
-try:
- if DR_GROUP_ID >= 0:
- DR_GROUP_ID += 1
-except NameError:
- DR_GROUP_ID = 0
- drg = []
-
-drg.append(trick.DRAscii("cannon"))
-drg[DR_GROUP_ID].set_freq(trick.DR_Always)
-drg[DR_GROUP_ID].set_cycle(0.01)
-drg[DR_GROUP_ID].set_single_prec_only(False)
-drg[DR_GROUP_ID].add_variable("dyn.cannon.pos[0]")
-drg[DR_GROUP_ID].add_variable("dyn.cannon.pos[1]")
-trick.add_data_record_group(drg[DR_GROUP_ID], trick.DR_Buffer)
-drg[DR_GROUP_ID].enable()
diff --git a/trick_sims/Cannon/SIM_cannon_integ/README.md b/trick_sims/Cannon/SIM_cannon_integ/README.md
deleted file mode 100644
index cf7abedd..00000000
--- a/trick_sims/Cannon/SIM_cannon_integ/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-#SIM\_cannon\_integ
-
-
-
-###The Simulation
-
-This is a simulation of a cannon shooting a cannonball. Given the initial position of the cannon ball, the muzzle velocity (speed) of the cannon ball, and the elevation angle of the cannon barrel the simulation computes the cannon ball's trajectory and time of impact with the ground.
-
-The acceleration of gravity is assumed to be -9.81 m/s2.
-
-
-
-
-
-
\ No newline at end of file
diff --git a/trick_sims/Cannon/SIM_cannon_integ/RUN_test/input.py b/trick_sims/Cannon/SIM_cannon_integ/RUN_test/input.py
deleted file mode 100644
index 67d1a2a9..00000000
--- a/trick_sims/Cannon/SIM_cannon_integ/RUN_test/input.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#execfile("Modified_data/realtime.py")
-execfile("Modified_data/cannon.dr")
-
-trick.TMM_reduced_checkpoint(0)
-
-dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 4)
-
-trick.stop(6)
diff --git a/trick_sims/Cannon/SIM_cannon_integ/RUN_test/unit_test.py b/trick_sims/Cannon/SIM_cannon_integ/RUN_test/unit_test.py
deleted file mode 100644
index 29455032..00000000
--- a/trick_sims/Cannon/SIM_cannon_integ/RUN_test/unit_test.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-dyn_integloop.getIntegrator(trick.Runge_Kutta_4, 4)
-trick.exec_set_terminate_time(5.2)
diff --git a/trick_sims/Cannon/SIM_cannon_integ/S_define b/trick_sims/Cannon/SIM_cannon_integ/S_define
deleted file mode 100644
index bdce1fd4..00000000
--- a/trick_sims/Cannon/SIM_cannon_integ/S_define
+++ /dev/null
@@ -1,36 +0,0 @@
-/************************TRICK HEADER*************************
-PURPOSE:
- (This S_define is used with RUN_integ input file)
-LIBRARY DEPENDENCIES:
- (
- (cannon/gravity/src/cannon_default_data.c)
- (cannon/gravity/src/cannon_init.c)
- (cannon/gravity/src/cannon_deriv.c)
- (cannon/gravity/src/cannon_integ.c)
- )
-*************************************************************/
-
-#include "sim_objects/default_trick_sys.sm"
-
-##include "cannon/gravity/include/cannon.h"
-##include "cannon/gravity/include/cannon_integ_proto.h"
-
-class CannonSimObject : public Trick::SimObject {
-
- public:
- CANNON cannon ;
-
- CannonSimObject() {
- ("default_data") cannon_default_data( &cannon ) ;
-
- ("initialization") cannon_init( &cannon ) ;
-
- ("derivative") cannon_deriv( &cannon ) ;
- ("integration") trick_ret = cannon_integ( &cannon ) ;
- }
-} ;
-
-// Instantiations
-CannonSimObject dyn ;
-
-IntegLoop dyn_integloop (0.01) dyn;
diff --git a/trick_sims/Cannon/SIM_cannon_integ/S_overrides.mk b/trick_sims/Cannon/SIM_cannon_integ/S_overrides.mk
deleted file mode 100644
index a2eff6d4..00000000
--- a/trick_sims/Cannon/SIM_cannon_integ/S_overrides.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-TRICK_CFLAGS += -I../models
-TRICK_CXXFLAGS += -I../models
-
diff --git a/trick_sims/Cannon/SIM_cannon_integ/images/CannonInit.png b/trick_sims/Cannon/SIM_cannon_integ/images/CannonInit.png
deleted file mode 100644
index 404ff6c7..00000000
Binary files a/trick_sims/Cannon/SIM_cannon_integ/images/CannonInit.png and /dev/null differ
diff --git a/trick_sims/Cannon/SIM_cannon_contact/Modified_data/cannon.dr b/trick_sims/Cannon/SIM_cannon_numeric/Modified_data/cannon.dr
similarity index 100%
rename from trick_sims/Cannon/SIM_cannon_contact/Modified_data/cannon.dr
rename to trick_sims/Cannon/SIM_cannon_numeric/Modified_data/cannon.dr
diff --git a/trick_sims/Cannon/SIM_cannon_contact/Modified_data/realtime.py b/trick_sims/Cannon/SIM_cannon_numeric/Modified_data/realtime.py
similarity index 100%
rename from trick_sims/Cannon/SIM_cannon_contact/Modified_data/realtime.py
rename to trick_sims/Cannon/SIM_cannon_numeric/Modified_data/realtime.py
diff --git a/trick_sims/Cannon/SIM_cannon_contact/RUN_test/input.py b/trick_sims/Cannon/SIM_cannon_numeric/RUN_test/input.py
similarity index 100%
rename from trick_sims/Cannon/SIM_cannon_contact/RUN_test/input.py
rename to trick_sims/Cannon/SIM_cannon_numeric/RUN_test/input.py
diff --git a/trick_sims/Cannon/SIM_cannon_contact/RUN_test/unit_test.py b/trick_sims/Cannon/SIM_cannon_numeric/RUN_test/unit_test.py
similarity index 100%
rename from trick_sims/Cannon/SIM_cannon_contact/RUN_test/unit_test.py
rename to trick_sims/Cannon/SIM_cannon_numeric/RUN_test/unit_test.py
diff --git a/trick_sims/Cannon/SIM_cannon_contact/S_define b/trick_sims/Cannon/SIM_cannon_numeric/S_define
similarity index 100%
rename from trick_sims/Cannon/SIM_cannon_contact/S_define
rename to trick_sims/Cannon/SIM_cannon_numeric/S_define
diff --git a/trick_sims/Cannon/SIM_cannon_contact/S_overrides.mk b/trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk
similarity index 100%
rename from trick_sims/Cannon/SIM_cannon_contact/S_overrides.mk
rename to trick_sims/Cannon/SIM_cannon_numeric/S_overrides.mk
diff --git a/trick_sims/Cannon/models/cannon/gravity/include/cannon_dt_proto.h b/trick_sims/Cannon/models/cannon/gravity/include/cannon_dt_proto.h
deleted file mode 100644
index ecd99dd1..00000000
--- a/trick_sims/Cannon/models/cannon/gravity/include/cannon_dt_proto.h
+++ /dev/null
@@ -1,23 +0,0 @@
-
-/*************************************************************************
-PURPOSE: (Cannonball Prototypes)
-**************************************************************************/
-
-#ifndef CANNON_DT_PROTO
-#define CANNON_DT_PROTO
-#include
-#include "cannon.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int cannon_dt(CANNON*) ;
-int cannon_init(CANNON*) ;
-int cannon_default_data(CANNON*) ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv_impact.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv_impact.c
deleted file mode 100644
index c6eedaaa..00000000
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_deriv_impact.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*****************************************************************************
-PURPOSE: ( Adding contact)
-*****************************************************************************/
-#include "../include/cannon.h"
-#include "../include/cannon_contact_proto.h"
-
-int cannon_deriv_impact( CANNON* C )
-{
- if ( ! C->impact ) {
- /* Still above ground and flying */
- C->acc[0] = 0.0 ;
- C->acc[1] = -9.81 ;
- }
-
- return 0 ;
-}
diff --git a/trick_sims/Cannon/models/cannon/gravity/src/cannon_dt.c b/trick_sims/Cannon/models/cannon/gravity/src/cannon_dt.c
deleted file mode 100644
index 553aee85..00000000
--- a/trick_sims/Cannon/models/cannon/gravity/src/cannon_dt.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************
-PURPOSE: ( Try dt )
-*****************************************************************************/
-#include "../include/cannon.h"
-#include "../include/cannon_dt_proto.h"
-
-int cannon_dt(
- CANNON* C )
-{
- double dt ;
- double pos0[2] ;
- double vel0[2] ;
- double acc0[2] ;
-
- /* This dt matches the frequency of this job */
- dt = 0.01 ;
-
- /* Save off last state */
- pos0[0] = C->pos[0] ; pos0[1] = C->pos[1] ;
- vel0[0] = C->vel[0] ; vel0[1] = C->vel[1] ;
- acc0[0] = C->acc[0] ; acc0[1] = C->acc[1] ;
-
- /* Calculate new state based on last state */
- C->acc[0] = acc0[0] ;
- C->acc[1] = acc0[1] ;
-
- C->vel[0] = vel0[0] + acc0[0]*dt ;
- C->vel[1] = vel0[1] + acc0[1]*dt ;
-
- C->pos[0] = pos0[0] + vel0[0]*dt + (0.5)*acc0[0]*dt*dt ;
- C->pos[1] = pos0[1] + vel0[1]*dt + (0.5)*acc0[1]*dt*dt ;
-
- return 0 ;
-}