Index: trunk/src/atmsdriver/ConsoleTrafficDriver.java
===================================================================
--- trunk/src/atmsdriver/ConsoleTrafficDriver.java	(revision 255)
+++ trunk/src/atmsdriver/ConsoleTrafficDriver.java	(revision 422)
@@ -1,9 +1,9 @@
 package atmsdriver;
 
-import atmsdriver.model.Highways;
-import atmsdriver.model.Station.DIRECTION;
-import atmsdriver.model.Highway;
-import atmsdriver.model.Station;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.Station.DIRECTION;
+import tmcsim.highwaymodel.Highway;
+import tmcsim.highwaymodel.Station;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
 import java.io.FileInputStream;
 import java.util.ArrayList;
@@ -49,9 +49,5 @@
                 // Create the Highway Model
                 Highways highways = new Highways(
-                    "config/vds_data/highways_fullmap.txt",
-                    ConsoleDriverProperties.getProperty(
-                        "FEPWriterHost"),
-                    Integer.parseInt(ConsoleDriverProperties.getProperty(
-                        "FEPWriterPort")));
+                    "config/vds_data/highways_fullmap.txt");
 
                 // Construct the console driver using the highways model
@@ -139,9 +135,5 @@
             {
                 // Send highway model to FEP for transmit to ATMS
-                try {
-                    highways.writeToFEP();
-                } catch (SimulationException ex) {
-                    System.out.println("Skipping writeToFEP...");
-                }
+                highways.toJson();
                 System.out.println("Add another entry or Quit? (A/Q)");
                 choice = sc.next().toUpperCase().trim().charAt(0);
Index: trunk/src/atmsdriver/TrafficEventsAnimator.java
===================================================================
--- trunk/src/atmsdriver/TrafficEventsAnimator.java	(revision 246)
+++ trunk/src/atmsdriver/TrafficEventsAnimator.java	(revision 422)
@@ -1,6 +1,6 @@
 package atmsdriver;
 
-import atmsdriver.model.Highways;
-import atmsdriver.model.TrafficEvent;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.TrafficEvent;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -66,7 +66,5 @@
         incidents = new HashMap<String, List<TrafficEvent>>();
         highways = new Highways(
-                "config/vds_data/highways_fullmap.txt",
-                // following aren't used by this application
-                "localhost", 8080);
+                "config/vds_data/highways_fullmap.txt");
         final String CONFIG_FILE_NAME = "traffic_model_config.properties";
         String propertiesFile = "config" + System.getProperty("file.separator") 
Index: trunk/src/atmsdriver/GoogleMapAnimator.java
===================================================================
--- trunk/src/atmsdriver/GoogleMapAnimator.java	(revision 340)
+++ trunk/src/atmsdriver/GoogleMapAnimator.java	(revision 422)
@@ -1,6 +1,6 @@
 package atmsdriver;
 
-import atmsdriver.model.Highways;
-import atmsdriver.model.TrafficEvent;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.TrafficEvent;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -67,7 +67,5 @@
         incidents = new HashMap<String, List<TrafficEvent>>();
         highways = new Highways(
-                "config/vds_data/highways_fullmap.txt",
-                // following aren't used by this application
-                "localhost", 8080);
+                "config/vds_data/highways_fullmap.txt");
         final String CONFIG_FILE_NAME = "traffic_model_config.properties";
         String propertiesFile = "config" + System.getProperty("file.separator") 
Index: trunk/src/atmsdriver/trafficeventseditor/TrafficLaneEvent.java
===================================================================
--- trunk/src/atmsdriver/trafficeventseditor/TrafficLaneEvent.java	(revision 238)
+++ trunk/src/atmsdriver/trafficeventseditor/TrafficLaneEvent.java	(revision 422)
@@ -1,7 +1,7 @@
 package atmsdriver.trafficeventseditor;
 
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import atmsdriver.model.Station;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Station;
 
 /**
Index: trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java
===================================================================
--- trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java	(revision 343)
+++ trunk/src/atmsdriver/trafficeventseditor/TrafficEventsEditor.java	(revision 422)
@@ -1,8 +1,8 @@
 package atmsdriver.trafficeventseditor;
 
-import atmsdriver.model.Highway;
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import atmsdriver.model.Station;
+import tmcsim.highwaymodel.Highway;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Station;
 import timeselector.*;
 import java.io.File;
Index: trunk/src/atmsdriver/trafficeventseditor/TimeFrames.java
===================================================================
--- trunk/src/atmsdriver/trafficeventseditor/TimeFrames.java	(revision 240)
+++ trunk/src/atmsdriver/trafficeventseditor/TimeFrames.java	(revision 422)
@@ -1,14 +1,10 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
+
 package atmsdriver.trafficeventseditor;
 
-import atmsdriver.model.Highway;
-import atmsdriver.model.Highways;
-import atmsdriver.model.LoopDetector;
-import atmsdriver.model.LoopDetector.DOTCOLOR;
-import atmsdriver.model.Station;
+import tmcsim.highwaymodel.Highway;
+import tmcsim.highwaymodel.Highways;
+import tmcsim.highwaymodel.LoopDetector;
+import tmcsim.highwaymodel.LoopDetector.DOTCOLOR;
+import tmcsim.highwaymodel.Station;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +31,5 @@
     {
         frames = new ArrayList<>();
-        highways = new Highways("./config/vds_data/highways_fullmap.txt", 
-                "192.168.251.46", 8080);
+        highways = new Highways("./config/vds_data/postmile_coordinates.txt");
     }
     
@@ -194,12 +189,5 @@
     void writeToFEP()
     {
-        try
-        {
-            highways.writeToFEP();
-        } 
-        catch (SimulationException ex)
-        {
-            System.out.println("writeToFEP() failed");
-        }
+            highways.toJson();
     }