Index: trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java
===================================================================
--- trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java	(revision 407)
+++ trunk/src/tmcsim/cadsimulator/managers/TrafficModelManager.java	(revision 422)
@@ -2,7 +2,7 @@
 
 import atmsdriver.GoogleMapAnimator;
-import atmsdriver.model.Highways;
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.TrafficEvent;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.TrafficEvent;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -129,7 +129,5 @@
             incidents = new HashMap<String, List<TrafficEvent>>();
             highways = new Highways(
-                    props.getProperty(PROPERTIES.HIGHWAYS_MAP_FILE.name),
-                    props.getProperty(PROPERTIES.FEPSIM_IP_ADDR.name),
-                    8080); 
+                    props.getProperty(PROPERTIES.HIGHWAYS_MAP_FILE.name)); 
             this.theCoordinator = theCoordinator;
         }
@@ -211,15 +209,4 @@
         timer.start();
 
-        if (props.getProperty(PROPERTIES.OUTPUT_DEST.name).equals("FEP"))
-        {
-            // Start the FEP thread (to update ATMS every 30 sec). (See class def below)
-            Thread wtfep = new WriteToFEPThread();
-            wtfep.start();
-        }
-        else
-        {
-            Thread wtConsole = new WriteToConsoleThread();
-            wtConsole.start();
-        }
         // Always write to json for google map display
         Thread wtJson = new WriteToJsonThread();
@@ -411,28 +398,4 @@
     }
 
-    class WriteToConsoleThread extends Thread
-    {
-
-        public void run()
-        {
-            System.out.println("WriteToConsole Thread starting.");
-            // Run indefinitely
-            while (true)
-            {
-                 // Write the highway network status to the Console
-                 System.out.println(highways.toString());
-                // Pause the thread
-                try
-                {
-                    Thread.sleep(10000);
-                }
-                catch (InterruptedException ie)
-                {
-                    ie.printStackTrace();
-                }
-            }
-
-        }
-    }
     /** Writes the highway model to a GeoJson file for reading
      *  by Google Maps.
@@ -475,43 +438,4 @@
     }
     
-    class WriteToFEPThread extends Thread
-    {
-
-        public void run()
-        {
-            System.out.println("WriteToFEP Thread starting.");
-            // Run indefinitely
-            boolean running = true;
-            while (running)
-            {
-                try
-                {
-                    // Write the highway network status to the FEP Simulator
-                    highways.writeToFEP();
-                }
-                catch (SimulationException ex)
-                {
-                    // Ask user if they want to proceed without FEP Sim connection
-//                    int reply = JOptionPane.showConfirmDialog(null, "Failed to connect to FEP Sim, proceed anyway?", "Network Failure", JOptionPane.YES_NO_OPTION);
-//                    if (reply == JOptionPane.NO_OPTION)
-//                    {
-//                        System.exit(0);
-//                    }
-                    System.out.println("Skipping writeToFEP...");
-                    running = false;
-                }
-
-                // Wait for FEP Sim to process the data we just sent
-                try
-                {
-                    Thread.sleep(FEPSIM_INTERVAL);
-                }
-                catch (InterruptedException ie)
-                {
-                    ie.printStackTrace();
-                }
-            }
-
-        }
-    }
+    
 }