Index: /trunk/src/tmcsim/cadsimulator/CADSimulator.java
===================================================================
--- /trunk/src/tmcsim/cadsimulator/CADSimulator.java	(revision 5)
+++ /trunk/src/tmcsim/cadsimulator/CADSimulator.java	(revision 33)
@@ -135,4 +135,5 @@
     private Properties cadSimulatorProperties;  
     
+    private static final String CONFIG_FILE_NAME = "cad_simulator_config.properties";
 
     /**
@@ -329,18 +330,10 @@
      */
     public static void main(String[] args) {
-        System.setProperty("CAD_SIM_PROPERTIES",  "config/cad_simulator_config.properties");
-        
-        try 
-        {
-            if(System.getProperty("CAD_SIM_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-                
-                new CADSimulator(System.getProperty("CAD_SIM_PROPERTIES"));
-            }
-            else
-            {
-                throw new Exception ("CAD_SIM_PROPERTIES system property not defined.");
-            }
+        if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+           new CADSimulator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
         }
         catch (Exception e) {
Index: /trunk/src/tmcsim/client/CADClient.java
===================================================================
--- /trunk/src/tmcsim/client/CADClient.java	(revision 2)
+++ /trunk/src/tmcsim/client/CADClient.java	(revision 33)
@@ -60,5 +60,5 @@
  * @version $Date: 2009/04/17 16:27:47 $ $Revision: 1.8 $
  */
-/*Hai :3  yeeeee*/
+
 public class CADClient extends UnicastRemoteObject implements
         CADClientInterface {
@@ -113,4 +113,6 @@
     private CADClientInterface client = this;
 
+    private static final String CONFIG_FILE_NAME = "cad_client_config.properties";
+    
     /**
      * Constructor. Initialize data from parsed properties file. Create a socket
@@ -319,4 +321,5 @@
                     e);
         }
+        
 
         // Ensure that the properties file does not have null values for the
@@ -473,17 +476,12 @@
      */
     public static void main(String[] args) {
-        System.setProperty("CAD_CLIENT_PROPERTIES",
-                "config/cad_client_config.properties");
+    	if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
 
         try {
-            if (System.getProperty("CAD_CLIENT_PROPERTIES") != null) {
-                UIManager.setLookAndFeel(UIManager
-                        .getSystemLookAndFeelClassName());
-
-                new CADClient(System.getProperty("CAD_CLIENT_PROPERTIES"));
-            } else {
-                throw new Exception(
-                        "CAD_CLIENT_PROPERTIES system property not defined.");
-            }
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new CADClient(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+         
         } catch (Exception e) {
             cadClientLogger.logp(Level.SEVERE, "SimulationManager", "Main",
Index: /trunk/src/tmcsim/simulationmanager/SimulationManager.java
===================================================================
--- /trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 14)
+++ /trunk/src/tmcsim/simulationmanager/SimulationManager.java	(revision 33)
@@ -9,6 +9,8 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+
 import tmcsim.common.CADEnums.PARAMICS_STATUS;
 import tmcsim.common.SimulationException;
@@ -45,5 +47,6 @@
 {
 
-    /**
+    private static final String CONFIG_FILE_NAME = "sim_manager_config.properties";
+	/**
      * Error logger.
      */
@@ -193,22 +196,14 @@
      * @param args Command line arguments.
      */
-    static public void main(String[] args)
-    {
-        //System.setProperty("SIM_MGR_PROPERTIES", "config/sim_manager_config.properties");
+    static public void main(String[] args) {
         //System.setProperty("swing.defaultlaf", "com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel");
-
-        try
-        {
-            if (System.getProperty("SIM_MGR_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-                new SimulationManager(System.getProperty("SIM_MGR_PROPERTIES"));
-            } else
-            {
-                throw new Exception("SIM_MGR_PROPERTIES system property not defined.");
-            }
-        } catch (Exception e)
-        {
+    	if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
+    	
+        try {           
+        	UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new SimulationManager(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
+        } catch (Exception e) {
             simManLogger.logp(Level.SEVERE, "SimulationManager", "Main",
                     "Error occured initializing application", e);
Index: /trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java
===================================================================
--- /trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 26)
+++ /trunk/src/tmcsim/paramicscommunicator/ParamicsCommunicator.java	(revision 33)
@@ -19,8 +19,11 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+
 import tmcsim.common.CADProtocol.PARAMICS_ACTIONS;
 import tmcsim.common.CADProtocol.PARAMICS_COMM_TAGS;
@@ -60,5 +63,6 @@
 {
 
-    /**
+    private static final String CONFIG_FILE_NAME = "paramics_communicator_config.properties";
+	/**
      * Error logger.
      */
@@ -480,22 +484,15 @@
      * @param args Command line arguments.
      */
-    public static void main(String[] args)
-    {
-        System.setProperty("PARAMICS_COMM_PROPERTIES", "config/paramics_communicator_config.properties");
-
-        try
-        {
-            if (System.getProperty("PARAMICS_COMM_PROPERTIES") != null)
-            {
-                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-
-                new Thread(new ParamicsCommunicator(System.getProperty(
-                        "PARAMICS_COMM_PROPERTIES"))).start();
-            } else
-            {
-                throw new Exception("PARAMICS_COMM_PROPERTIES system property not defined.");
-            }
-        } catch (Exception e)
-        {
+    public static void main(String[] args) {
+    	if(System.getProperty("CONFIG_DIR") == null){
+        	System.setProperty("CONFIG_DIR", "config");
+        }
+    	
+        try{
+
+        	UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new Thread(new ParamicsCommunicator(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME)).start();
+        
+        } catch (Exception e) {
             paramLogger.logp(Level.SEVERE, "ParamicsCommunicator", "Main",
                     "Error occured initializing application", e);
Index: /trunk/src/tmcsim/paramicslog/ParamicsLog.java
===================================================================
--- /trunk/src/tmcsim/paramicslog/ParamicsLog.java	(revision 2)
+++ /trunk/src/tmcsim/paramicslog/ParamicsLog.java	(revision 33)
@@ -62,4 +62,6 @@
         }
     }
+
+	private static final String CONFIG_FILE_NAME = "paramics_communicator_logging.properties";
     
     /** Error logger. */
@@ -87,16 +89,11 @@
      * Creates the singleton instance of this class.
      */
-    static
-    {
-        try 
-        {
-            if (System.getProperty("PARAMICS_LOG_PROPERTIES") != null)
-            {
-                instance = new ParamicsLog(System.getProperty("PARAMICS_LOG_PROPERTIES"));
-            }
-            else
-            {
-                throw new Exception("PARAMICS_LOG_PROPERTIES system property not defined.");
-            }
+    static {
+        try {
+        	if(System.getProperty("CONFIG_DIR") == null){
+            	System.setProperty("CONFIG_DIR", "config");
+            }
+        	
+        	instance = new ParamicsLog(System.getProperty("CONFIG_DIR") + System.getProperty("file.separator") + CONFIG_FILE_NAME);
         } 
         catch (Exception e)