Index: trunk/config/cad_simulator_config.properties
===================================================================
--- trunk/config/cad_simulator_config.properties	(revision 411)
+++ trunk/config/cad_simulator_config.properties	(revision 423)
@@ -8,6 +8,6 @@
 ParamicsProperties     = config/cad_simulator_paramics_config.properties
 ATMSProperties         = config/cad_simulator_atms_config.properties
+MediaProperties        = config/cad_simulator_media_config.properties
 TrafficMgrProperties   = config/traffic_model_config/traffic_model_config.properties
-MediaProperties        = config/cad_simulator_media_config.properties
 # The location where the Coordinator writes the simulation time
 ElapsedTimeFile        = webapps/dynamicdata/sim_elapsedtime.json
Index: trunk/config/traffic_model_config/traffic_model_config.properties
===================================================================
--- trunk/config/traffic_model_config/traffic_model_config.properties	(revision 411)
+++ trunk/config/traffic_model_config/traffic_model_config.properties	(revision 423)
@@ -1,3 +1,3 @@
-Highways_Map_File = config/vds_data/highways_triangle.txt
+Highways_Map_File = config/vds_data/postmile_coordinates.txt
 #Highways_Map_File = config/vds_data/highways_fullmap.txt
 #Events_File = config/vds_data/single_event_55S.txt
Index: trunk/config/cad_simulator_console_config.properties
===================================================================
--- trunk/config/cad_simulator_console_config.properties	(revision 385)
+++ trunk/config/cad_simulator_console_config.properties	(revision 423)
@@ -9,3 +9,5 @@
 ATMSProperties         = config/cad_simulator_atms_config.properties
 MediaProperties        = config/cad_simulator_media_config.properties
-TrafficMgrProperties   = config/testConfig/traffic_model_config.properties
+TrafficMgrProperties   = config/traffic_model_config/traffic_model_config.properties
+# The location where the Coordinator writes the simulation time
+ElapsedTimeFile        = webapps/dynamicdata/sim_elapsedtime.json
Index: trunk/config/cad_simulator_smoketest_config.properties
===================================================================
--- trunk/config/cad_simulator_smoketest_config.properties	(revision 229)
+++ trunk/config/cad_simulator_smoketest_config.properties	(revision 423)
@@ -8,4 +8,5 @@
 ParamicsProperties     = config/cad_simulator_paramics_config.properties
 ATMSProperties         = config/cad_simulator_atms_config.properties
-TrafficMgrProperties   = config/testConfig/traffic_model_config.properties
+TrafficMgrProperties   = config/traffic_model_config/traffic_model_config.properties
 MediaProperties        = config/cad_simulator_media_config.properties
+ElapsedTimeFile        = webapps/dynamicdata/sim_elapsedtime.json
Index: trunk/config/traffic_model_config.properties
===================================================================
--- trunk/config/traffic_model_config.properties	(revision 251)
+++ 	(revision )
@@ -1,6 +1,0 @@
-Highways_Map_File = config/vds_data/highways_fullmap.txt
-Events_File = config/vds_data/atmsBatchEvents.txt
-FEPSim_IP_addr = 192.168.251.46
-Output_Destination = FEP 
-
-