diff --git a/CMakeLists.txt b/CMakeLists.txt
index 708b8b6..96fd359 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,23 +129,7 @@
   DEPENDS ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterLexer.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aPpParser.g4 ${PROJECT_SOURCE_DIR}/grammar/SV3_1aSplitterParser.g4 ${PROJECT_SOURCE_DIR}/src/API/slapi.i
  )
 
-include_directories(
-  ${PROJECT_SOURCE_DIR}/src/API
-  ${PROJECT_SOURCE_DIR}/src/Design
-  ${PROJECT_SOURCE_DIR}/src/Library
-  ${PROJECT_SOURCE_DIR}/src/parser
-  ${PROJECT_SOURCE_DIR}/src/SourceCompile
-  ${PROJECT_SOURCE_DIR}/src/DesignCompile
-  ${PROJECT_SOURCE_DIR}/src/Testbench
-  ${PROJECT_SOURCE_DIR}/src/CommandLine
-  ${PROJECT_SOURCE_DIR}/src/Common
-  ${PROJECT_SOURCE_DIR}/src/ErrorReporting
-  ${PROJECT_SOURCE_DIR}/src/Utils
-  ${PROJECT_SOURCE_DIR}/src/Cache
-  ${PROJECT_SOURCE_DIR}/src/Config
-  ${PROJECT_SOURCE_DIR}/src/Expression
-  ${PROJECT_SOURCE_DIR}/src/Package
-)
+include_directories(${PROJECT_SOURCE_DIR}/src)
 
 file(GLOB surelog_SRC
   ${PROJECT_SOURCE_DIR}/src/parser/SV3_1aLexer.cpp
diff --git a/src/API/PythonAPI.cpp b/src/API/PythonAPI.cpp
index ee445f7..e30869f 100644
--- a/src/API/PythonAPI.cpp
+++ b/src/API/PythonAPI.cpp
@@ -21,21 +21,21 @@
  * Created on May 13, 2017, 4:42 PM
  */
 
-#include "../SourceCompile/SymbolTable.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/FileUtils.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
 #include "antlr4-runtime.h"
 using namespace std;
 using namespace antlr4;
 
-#include "../parser/SV3_1aParserBaseListener.h"
+#include "parser/SV3_1aParserBaseListener.h"
 
 #include "SV3_1aPythonListener.h"
 
@@ -53,7 +53,7 @@
 #include "slapi.h"
 #include "vobjecttypes_py.h"
 #include <cstdlib>
-#include "../SourceCompile/PythonListen.h"
+#include "SourceCompile/PythonListen.h"
 
 std::string PythonAPI::m_invalidScriptResult = "INVALID_PYTHON_SCRIPT_RESULT";
 
diff --git a/src/API/SLAPI.cpp b/src/API/SLAPI.cpp
index 4aea9f7..b87bb21 100644
--- a/src/API/SLAPI.cpp
+++ b/src/API/SLAPI.cpp
@@ -24,21 +24,21 @@
 #include <string>
 #include <vector>
 
-#include "../ErrorReporting/Waiver.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../Utils/StringUtils.h"
+#include "ErrorReporting/Waiver.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "Utils/StringUtils.h"
 
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/PythonListen.h"
-#include "../Design/FileContent.h"
-#include "../Testbench/ClassDefinition.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/PythonListen.h"
+#include "Design/FileContent.h"
+#include "Testbench/ClassDefinition.h"
 #include <cstdlib>
 #include <iostream>
 #include "antlr4-runtime.h"
@@ -46,12 +46,12 @@
 using namespace antlr4;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
-#include "../parser/SV3_1aParserBaseListener.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
+#include "parser/SV3_1aParserBaseListener.h"
 #include "SV3_1aPythonListener.h"
-#include "../Utils/ParseUtils.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
 #include "PythonAPI.h"
 
 #include "SLAPI.h"
diff --git a/src/API/SV3_1aPythonListener.cpp b/src/API/SV3_1aPythonListener.cpp
index ca16fdf..7a32fe7 100644
--- a/src/API/SV3_1aPythonListener.cpp
+++ b/src/API/SV3_1aPythonListener.cpp
@@ -11,15 +11,15 @@
  * 
  * Created on April 16, 2017, 8:28 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/PythonListen.h"
+#include "SourceCompile/SymbolTable.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/PythonListen.h"
 #include <cstdlib>
 #include <iostream>
 #include "antlr4-runtime.h"
@@ -27,13 +27,13 @@
 using namespace antlr4;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
-#include "../parser/SV3_1aParserBaseListener.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
+#include "parser/SV3_1aParserBaseListener.h"
 #include "SV3_1aPythonListener.h"
 using namespace antlr4;
-#include "../Utils/ParseUtils.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
 #include "PythonAPI.h"
 
 SV3_1aPythonListener::SV3_1aPythonListener (PythonListen* pl, PyThreadState* interpState, antlr4::CommonTokenStream* tokens, unsigned int lineOffset) : 
diff --git a/src/Cache/Cache.cpp b/src/Cache/Cache.cpp
index eec5dbc..7a8b5d1 100644
--- a/src/Cache/Cache.cpp
+++ b/src/Cache/Cache.cpp
@@ -26,10 +26,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <iostream>
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/ErrorContainer.h"
 #include "Cache.h"
-#include "../CommandLine/CommandLineParser.hpp"
+#include "CommandLine/CommandLineParser.hpp"
 #include "flatbuffers/util.h"
 
 using namespace SURELOG;
diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp
index 7e8eab3..6c90d18 100644
--- a/src/Cache/PPCache.cpp
+++ b/src/Cache/PPCache.cpp
@@ -20,15 +20,15 @@
  *
  * Created on April 23, 2017, 8:49 PM
  */
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/FileUtils.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
 #include "Cache.h"
 #include "PPCache.h"
 #include "flatbuffers/util.h"
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <algorithm>
-#include "../Package/Precompiled.h"
+#include "Package/Precompiled.h"
 using namespace SURELOG;
 
 PPCache::PPCache(PreprocessFile* pp) : m_pp(pp), m_isPrecompiled(false) {}
diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp
index 6fbe613..156401f 100644
--- a/src/Cache/ParseCache.cpp
+++ b/src/Cache/ParseCache.cpp
@@ -20,16 +20,16 @@
  *
  * Created on April 29, 2017, 4:20 PM
  */
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/FileUtils.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
 #include "Cache.h"
 #include "flatbuffers/util.h"
 #include <cstdio>
@@ -37,8 +37,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "ParseCache.h"
-#include "../Design/FileContent.h"
-#include "../Package/Precompiled.h"
+#include "Design/FileContent.h"
+#include "Package/Precompiled.h"
 using namespace SURELOG;
 
 ParseCache::ParseCache(ParseFile* parser)
diff --git a/src/Cache/PythonAPICache.cpp b/src/Cache/PythonAPICache.cpp
index 6437d5c..1842953 100644
--- a/src/Cache/PythonAPICache.cpp
+++ b/src/Cache/PythonAPICache.cpp
@@ -21,16 +21,16 @@
  * Created on May 28, 2017, 10:49 PM
  */
 
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/FileUtils.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
 #include "Cache.h"
 #include "flatbuffers/util.h"
 #include <cstdio>
@@ -41,9 +41,9 @@
 #include "antlr4-runtime.h"
 using namespace antlr4;
 
-#include "../API/PythonAPI.h"
+#include "API/PythonAPI.h"
 #include "PythonAPICache.h"
-#include "../SourceCompile/PythonListen.h"
+#include "SourceCompile/PythonListen.h"
 
 using namespace SURELOG;
 
diff --git a/src/CommandLine/CommandLineParser.cpp b/src/CommandLine/CommandLineParser.cpp
index 9b7e855..3c42472 100644
--- a/src/CommandLine/CommandLineParser.cpp
+++ b/src/CommandLine/CommandLineParser.cpp
@@ -28,13 +28,13 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "CommandLineParser.hpp"
-#include "../Utils/StringUtils.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
 
 #include "antlr4-runtime.h"
 using namespace antlr4;
 
-#include "../API/PythonAPI.h"
+#include "API/PythonAPI.h"
 
 #include <ctime>
 #include <thread>
diff --git a/src/CommandLine/CommandLineParser.hpp b/src/CommandLine/CommandLineParser.hpp
index 7ebe7bd..cec2ed5 100644
--- a/src/CommandLine/CommandLineParser.hpp
+++ b/src/CommandLine/CommandLineParser.hpp
@@ -26,8 +26,8 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/ErrorContainer.h"
 
 namespace SURELOG {
 
diff --git a/src/Common/ClockingBlockHolder.h b/src/Common/ClockingBlockHolder.h
index ee6fc73..24d1d6d 100644
--- a/src/Common/ClockingBlockHolder.h
+++ b/src/Common/ClockingBlockHolder.h
@@ -24,9 +24,9 @@
 #ifndef CLOCKINGBLOCKHOLDER_H
 #define CLOCKINGBLOCKHOLDER_H
 #include <map>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/Signal.h"
-#include "../Design/ClockingBlock.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/Signal.h"
+#include "Design/ClockingBlock.h"
 
 namespace SURELOG {
 
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index be559f4..065d482 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -20,8 +20,8 @@
  *
  * Created on February 10, 2018, 11:09 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 #include "Config.h"
 using namespace SURELOG;
 
diff --git a/src/Config/ConfigSet.cpp b/src/Config/ConfigSet.cpp
index c88e02b..56893b6 100644
--- a/src/Config/ConfigSet.cpp
+++ b/src/Config/ConfigSet.cpp
@@ -20,8 +20,8 @@
  *
  * Created on February 10, 2018, 11:14 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 #include "ConfigSet.h"
 using namespace SURELOG;
 
diff --git a/src/Design/ClockingBlock.cpp b/src/Design/ClockingBlock.cpp
index 5e012fc..794a1b2 100644
--- a/src/Design/ClockingBlock.cpp
+++ b/src/Design/ClockingBlock.cpp
@@ -20,7 +20,7 @@
  *
  * Created on May 26, 2018, 11:07 AM
  */
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileContent.h"
 #include "Signal.h"
 #include "ClockingBlock.h"
diff --git a/src/Design/DataType.cpp b/src/Design/DataType.cpp
index b8d931e..fdfe803 100644
--- a/src/Design/DataType.cpp
+++ b/src/Design/DataType.cpp
@@ -20,9 +20,9 @@
  *
  * Created on June 14, 2018, 10:07 PM
  */
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileContent.h"
-#include "../Expression/Value.h"
+#include "Expression/Value.h"
 #include "DataType.h"
 
 using namespace SURELOG;
diff --git a/src/Design/DefParam.cpp b/src/Design/DefParam.cpp
index 3f3dbc1..54351d7 100644
--- a/src/Design/DefParam.cpp
+++ b/src/Design/DefParam.cpp
@@ -21,8 +21,8 @@
  * Created on January 7, 2018, 8:55 PM
  */
 
-#include "../SourceCompile/SymbolTable.h"
-#include "../Library/Library.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Library/Library.h"
 #include "FileContent.h"
 #include "DefParam.h"
 
diff --git a/src/Design/DefParam.h b/src/Design/DefParam.h
index 6be1311..8af25d9 100644
--- a/src/Design/DefParam.h
+++ b/src/Design/DefParam.h
@@ -23,7 +23,7 @@
 
 #ifndef DEFPARAM_H
 #define DEFPARAM_H
-#include "../Expression/Value.h"
+#include "Expression/Value.h"
 #include <map>
 
 namespace SURELOG {
diff --git a/src/Design/Design.cpp b/src/Design/Design.cpp
index 40b4867..dc19f59 100644
--- a/src/Design/Design.cpp
+++ b/src/Design/Design.cpp
@@ -22,23 +22,23 @@
  */
 #include <queue>
 #include <set>
-#include "../Utils/StringUtils.h"
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
+#include "Utils/StringUtils.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
 #include "FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../Utils/FileUtils.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "Utils/FileUtils.h"
 #include "Design.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/ClassDefinition.h"
 
 using namespace SURELOG;
 
diff --git a/src/Design/Design.h b/src/Design/Design.h
index 1fbd958..b03352c 100644
--- a/src/Design/Design.h
+++ b/src/Design/Design.h
@@ -26,10 +26,10 @@
 #include "ModuleDefinition.h"
 #include "ModuleInstance.h"
 #include "DefParam.h"
-#include "../Library/LibrarySet.h"
-#include "../Config/ConfigSet.h"
-#include "../Package/Package.h"
-#include "../Testbench/Program.h"
+#include "Library/LibrarySet.h"
+#include "Config/ConfigSet.h"
+#include "Package/Package.h"
+#include "Testbench/Program.h"
 
 namespace SURELOG {
 
diff --git a/src/Design/DesignComponent.cpp b/src/Design/DesignComponent.cpp
index 32e4117..e5f57d6 100644
--- a/src/Design/DesignComponent.cpp
+++ b/src/Design/DesignComponent.cpp
@@ -21,12 +21,12 @@
  * Created on March 25, 2018, 10:27 PM
  */
 #include <vector>
-#include "../SourceCompile/SymbolTable.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/VObjectTypes.h"
 #include "FileContent.h"
 #include "DesignComponent.h"
 #include "Function.h"
-#include "../Testbench/Variable.h"
+#include "Testbench/Variable.h"
 
 using namespace SURELOG;
 
diff --git a/src/Design/DesignComponent.h b/src/Design/DesignComponent.h
index 31625dc..ce24c25 100644
--- a/src/Design/DesignComponent.h
+++ b/src/Design/DesignComponent.h
@@ -25,10 +25,10 @@
 #define DESIGNCOMPONENT_H
 #include <vector>
 #include <map>
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/VObjectTypes.h"
 #include "FileCNodeId.h"
 #include "DataType.h"
-#include "../Testbench/TypeDef.h"
+#include "Testbench/TypeDef.h"
 #include "ValuedComponentI.h"
 
 namespace SURELOG {
diff --git a/src/Design/DesignElement.cpp b/src/Design/DesignElement.cpp
index c25bc10..6dbf59a 100644
--- a/src/Design/DesignElement.cpp
+++ b/src/Design/DesignElement.cpp
@@ -20,7 +20,7 @@
  *
  * Created on June 8, 2017, 8:05 PM
  */
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "TimeInfo.h"
 #include "DesignElement.h"
 
diff --git a/src/Design/Enum.cpp b/src/Design/Enum.cpp
index 75d533e..e14f5e9 100644
--- a/src/Design/Enum.cpp
+++ b/src/Design/Enum.cpp
@@ -20,8 +20,8 @@
  *
  * Created on May 19, 2019, 11:55 AM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 #include "Enum.h"
 using namespace SURELOG;
 
diff --git a/src/Design/FileCNodeId.h b/src/Design/FileCNodeId.h
index 05a5562..cc286ee 100644
--- a/src/Design/FileCNodeId.h
+++ b/src/Design/FileCNodeId.h
@@ -24,7 +24,7 @@
 #ifndef FILECNODEID_H
 #define FILECNODEID_H
 
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 
 namespace SURELOG {
 class FileContent;
diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp
index 30c6f88..737d03a 100644
--- a/src/Design/FileContent.cpp
+++ b/src/Design/FileContent.cpp
@@ -21,11 +21,11 @@
  * Created on June 8, 2017, 8:22 PM
  */
 
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "TimeInfo.h"
 #include "DesignElement.h"
-#include "../Library/Library.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "Library/Library.h"
+#include "ErrorReporting/ErrorContainer.h"
 #include "FileContent.h"
 #include <queue>
 #include <iostream>
diff --git a/src/Design/FileContent.h b/src/Design/FileContent.h
index 06378e1..3d0224f 100644
--- a/src/Design/FileContent.h
+++ b/src/Design/FileContent.h
@@ -31,7 +31,7 @@
 #include "DesignComponent.h"
 #include "ValuedComponentI.h"
 #include "VObject.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/VObjectTypes.h"
 
 namespace SURELOG {
 
diff --git a/src/Design/Function.h b/src/Design/Function.h
index abdeceb..ab7827d 100644
--- a/src/Design/Function.h
+++ b/src/Design/Function.h
@@ -24,15 +24,15 @@
 #ifndef FUNCTION_H
 #define FUNCTION_H
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileContent.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/VObjectTypes.h"
 #include "DataType.h"
 #include "Scope.h"
 #include "TfPortItem.h"
 #include "Statement.h"
-#include "../Testbench/Variable.h"
-#include "../DesignCompile/CompileHelper.h"
+#include "Testbench/Variable.h"
+#include "DesignCompile/CompileHelper.h"
 
 namespace SURELOG {
 
diff --git a/src/Design/ModuleDefinition.cpp b/src/Design/ModuleDefinition.cpp
index 8c4747d..911597c 100644
--- a/src/Design/ModuleDefinition.cpp
+++ b/src/Design/ModuleDefinition.cpp
@@ -21,8 +21,8 @@
  * Created on October 20, 2017, 10:29 PM
  */
 
-#include "../SourceCompile/SymbolTable.h"
-#include "../Library/Library.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Library/Library.h"
 #include "FileContent.h"
 #include "ModuleDefinition.h"
 
diff --git a/src/Design/ModuleDefinition.h b/src/Design/ModuleDefinition.h
index bd6dacf..6a16402 100644
--- a/src/Design/ModuleDefinition.h
+++ b/src/Design/ModuleDefinition.h
@@ -29,7 +29,7 @@
 #include "Signal.h"
 #include "ClockingBlock.h"
 #include "DataType.h"
-#include "../Common/ClockingBlockHolder.h"
+#include "Common/ClockingBlockHolder.h"
 
 namespace SURELOG {
 class CompileModule;
diff --git a/src/Design/ModuleInstance.cpp b/src/Design/ModuleInstance.cpp
index b86f778..3b2dfdd 100644
--- a/src/Design/ModuleInstance.cpp
+++ b/src/Design/ModuleInstance.cpp
@@ -22,8 +22,8 @@
  */
 #include <string>
 #include <iostream>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Library/Library.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Library/Library.h"
 #include "FileContent.h"
 
 #include "ModuleInstance.h"
diff --git a/src/Design/ModuleInstance.h b/src/Design/ModuleInstance.h
index 6675912..264b4e2 100644
--- a/src/Design/ModuleInstance.h
+++ b/src/Design/ModuleInstance.h
@@ -25,8 +25,8 @@
 #define MODULEINSTANCE_H
 
 #include "ModuleDefinition.h"
-#include "../Expression/Value.h"
-#include "../Expression/ExprBuilder.h"
+#include "Expression/Value.h"
+#include "Expression/ExprBuilder.h"
 #include "ValuedComponentI.h"
 
 namespace SURELOG {
diff --git a/src/Design/Parameter.h b/src/Design/Parameter.h
index d58338b..2b8ab5e 100644
--- a/src/Design/Parameter.h
+++ b/src/Design/Parameter.h
@@ -24,8 +24,8 @@
 #ifndef PARAMETER_H
 #define PARAMETER_H
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 
 namespace SURELOG {
 
diff --git a/src/Design/Scope.h b/src/Design/Scope.h
index bd6757b..e5f0ec4 100644
--- a/src/Design/Scope.h
+++ b/src/Design/Scope.h
@@ -24,13 +24,13 @@
 #ifndef SCOPE_H
 #define SCOPE_H
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileContent.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/VObjectTypes.h"
 #include "DataType.h"
 #include "TfPortItem.h"
-#include "../Testbench/Variable.h"
-#include "../DesignCompile/CompileHelper.h"
+#include "Testbench/Variable.h"
+#include "DesignCompile/CompileHelper.h"
 
 namespace SURELOG {
 
diff --git a/src/Design/Signal.cpp b/src/Design/Signal.cpp
index 144ed8c..a9bfd5b 100644
--- a/src/Design/Signal.cpp
+++ b/src/Design/Signal.cpp
@@ -20,7 +20,7 @@
  *
  * Created on May 6, 2018, 5:32 PM
  */
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileContent.h"
 #include "Signal.h"
 
diff --git a/src/Design/Statement.h b/src/Design/Statement.h
index 35a036c..5a64cc4 100644
--- a/src/Design/Statement.h
+++ b/src/Design/Statement.h
@@ -24,9 +24,9 @@
 #ifndef STATEMENT_H
 #define STATEMENT_H
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileContent.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/VObjectTypes.h"
 #include "DataType.h"
 #include "Scope.h"
 
diff --git a/src/Design/Task.h b/src/Design/Task.h
index fa4bfe4..e0c1b4a 100644
--- a/src/Design/Task.h
+++ b/src/Design/Task.h
@@ -24,8 +24,8 @@
 #ifndef TASK_H
 #define TASK_H
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 #include "Function.h"
 
 namespace SURELOG {
diff --git a/src/Design/TfPortItem.cpp b/src/Design/TfPortItem.cpp
index 97f453e..5d7a252 100644
--- a/src/Design/TfPortItem.cpp
+++ b/src/Design/TfPortItem.cpp
@@ -22,8 +22,8 @@
  */
 
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Expression/Value.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Expression/Value.h"
 #include "DesignComponent.h"
 #include "FileContent.h"
 #include "TfPortItem.h"
diff --git a/src/Design/TfPortItem.h b/src/Design/TfPortItem.h
index bcb3f99..96927d2 100644
--- a/src/Design/TfPortItem.h
+++ b/src/Design/TfPortItem.h
@@ -24,7 +24,7 @@
 #ifndef TFPORTITEM_H
 #define TFPORTITEM_H
 
-#include "../Testbench/Variable.h"
+#include "Testbench/Variable.h"
 
 namespace SURELOG {
 class Procedure;
diff --git a/src/Design/TimeInfo.cpp b/src/Design/TimeInfo.cpp
index 1efb73a..1e9b782 100644
--- a/src/Design/TimeInfo.cpp
+++ b/src/Design/TimeInfo.cpp
@@ -21,7 +21,7 @@
  * Created on June 8, 2017, 8:27 PM
  */
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "TimeInfo.h"
 
 using namespace SURELOG;
diff --git a/src/Design/VObject.cpp b/src/Design/VObject.cpp
index 79c595a..2bef0bd 100644
--- a/src/Design/VObject.cpp
+++ b/src/Design/VObject.cpp
@@ -21,7 +21,7 @@
  * Created on June 14, 2017, 10:58 PM
  */
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "VObject.h"
 
 using namespace SURELOG;
diff --git a/src/Design/VObject.h b/src/Design/VObject.h
index b7a645b..ebdc016 100644
--- a/src/Design/VObject.h
+++ b/src/Design/VObject.h
@@ -24,8 +24,8 @@
 #ifndef VOBJECT_H
 #define VOBJECT_H
 
-#include "../SourceCompile/SymbolTable.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/VObjectTypes.h"
 
 namespace SURELOG {
 
diff --git a/src/Design/ValuedComponentI.cpp b/src/Design/ValuedComponentI.cpp
index a49d58b..1d47230 100644
--- a/src/Design/ValuedComponentI.cpp
+++ b/src/Design/ValuedComponentI.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <string>
-#include "../Expression/ExprBuilder.h"
+#include "Expression/ExprBuilder.h"
 #include "ValuedComponentI.h"
 
 using namespace SURELOG;
diff --git a/src/DesignCompile/Builtin.cpp b/src/DesignCompile/Builtin.cpp
index 7d578a2..89d131f 100644
--- a/src/DesignCompile/Builtin.cpp
+++ b/src/DesignCompile/Builtin.cpp
@@ -20,26 +20,26 @@
  *
  * Created on May 30, 2019, 6:36 PM
  */
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/Signal.h"
-#include "../Design/FileContent.h"
-#include "../Design/ClockingBlock.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../DesignCompile/CompileDesign.h"
-#include "../Testbench/ClassDefinition.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/Signal.h"
+#include "Design/FileContent.h"
+#include "Design/ClockingBlock.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
+#include "DesignCompile/CompileDesign.h"
+#include "Testbench/ClassDefinition.h"
 #include "CompileClass.h"
 #include "Builtin.h"
 using namespace SURELOG;
diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp
index 79c807e..c4b83a0 100644
--- a/src/DesignCompile/CompileClass.cpp
+++ b/src/DesignCompile/CompileClass.cpp
@@ -20,26 +20,26 @@
  *
  * Created on June 7, 2018, 10:26 PM
  */
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/Signal.h"
-#include "../Design/FileContent.h"
-#include "../Design/ClockingBlock.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../DesignCompile/CompileDesign.h"
-#include "../Testbench/ClassDefinition.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/Signal.h"
+#include "Design/FileContent.h"
+#include "Design/ClockingBlock.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
+#include "DesignCompile/CompileDesign.h"
+#include "Testbench/ClassDefinition.h"
 #include "CompileClass.h"
 
 using namespace SURELOG;
diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp
index e4adaed..183125e 100644
--- a/src/DesignCompile/CompileDesign.cpp
+++ b/src/DesignCompile/CompileDesign.cpp
@@ -20,21 +20,21 @@
  *
  * Created on July 1, 2017, 1:11 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../SourceCompile/ParseFile.h"
-#include "../Testbench/ClassDefinition.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "SourceCompile/ParseFile.h"
+#include "Testbench/ClassDefinition.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
 #include "ResolveSymbols.h"
 #include "DesignElaboration.h"
diff --git a/src/DesignCompile/CompileFileContent.cpp b/src/DesignCompile/CompileFileContent.cpp
index 7fb4e7e..a64b26a 100644
--- a/src/DesignCompile/CompileFileContent.cpp
+++ b/src/DesignCompile/CompileFileContent.cpp
@@ -20,22 +20,22 @@
  *
  * Created on March 28, 2018, 10:16 PM
  */
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
 #include "CompileFileContent.h"
 #include "CompileHelper.h"
diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp
index 08c3ad0..bb61fca 100644
--- a/src/DesignCompile/CompileHelper.cpp
+++ b/src/DesignCompile/CompileHelper.cpp
@@ -21,17 +21,17 @@
  * Created on May 14, 2019, 8:03 PM
  */
 
-#include "../Expression/Value.h"
-#include "../Expression/ExprBuilder.h"
-#include "../Design/Enum.h"
-#include "../Design/Function.h"
-#include "../Testbench/Property.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../Design/Design.h"
+#include "Expression/Value.h"
+#include "Expression/ExprBuilder.h"
+#include "Design/Enum.h"
+#include "Design/Function.h"
+#include "Testbench/Property.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
+#include "Design/Design.h"
 #include "CompileHelper.h"
 #include <iostream>
 using namespace SURELOG;
diff --git a/src/DesignCompile/CompileHelper.h b/src/DesignCompile/CompileHelper.h
index 368a909..b1d0252 100644
--- a/src/DesignCompile/CompileHelper.h
+++ b/src/DesignCompile/CompileHelper.h
@@ -24,13 +24,13 @@
 #ifndef COMPILEHELPER_H
 #define COMPILEHELPER_H
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/DataType.h"
-#include "../Design/TfPortItem.h"
-#include "../Expression/ExprBuilder.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/DataType.h"
+#include "Design/TfPortItem.h"
+#include "Expression/ExprBuilder.h"
+#include "ErrorReporting/ErrorContainer.h"
 
 namespace SURELOG {
 class Scope;
diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp
index 0802487..2bdd498 100644
--- a/src/DesignCompile/CompileModule.cpp
+++ b/src/DesignCompile/CompileModule.cpp
@@ -21,25 +21,25 @@
  * Created on March 22, 2018, 9:43 PM
  */
 
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/Signal.h"
-#include "../Design/FileContent.h"
-#include "../Design/ClockingBlock.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../Testbench/ClassDefinition.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/Signal.h"
+#include "Design/FileContent.h"
+#include "Design/ClockingBlock.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
+#include "Testbench/ClassDefinition.h"
 #include "CompileHelper.h"
 #include "CompileDesign.h"
 #include "CompileModule.h"
diff --git a/src/DesignCompile/CompilePackage.cpp b/src/DesignCompile/CompilePackage.cpp
index 9a9cdd7..e475270 100644
--- a/src/DesignCompile/CompilePackage.cpp
+++ b/src/DesignCompile/CompilePackage.cpp
@@ -21,23 +21,23 @@
  * Created on March 22, 2018, 9:57 PM
  */
 
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../Design/Statement.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
+#include "Design/Statement.h"
 #include "CompileDesign.h"
 #include "CompileHelper.h"
 #include "CompilePackage.h"
diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp
index f9aa3ef..b48852b 100644
--- a/src/DesignCompile/CompileProgram.cpp
+++ b/src/DesignCompile/CompileProgram.cpp
@@ -20,25 +20,25 @@
  *
  * Created on June 6, 2018, 10:43 PM
  */
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/Signal.h"
-#include "../Design/FileContent.h"
-#include "../Design/ClockingBlock.h"
-#include "../Testbench/ClassDefinition.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/Signal.h"
+#include "Design/FileContent.h"
+#include "Design/ClockingBlock.h"
+#include "Testbench/ClassDefinition.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileHelper.h"
 #include "CompileDesign.h"
 #include "CompileProgram.h"
diff --git a/src/DesignCompile/CompileStep.h b/src/DesignCompile/CompileStep.h
index e675a63..ae34f22 100644
--- a/src/DesignCompile/CompileStep.h
+++ b/src/DesignCompile/CompileStep.h
@@ -23,7 +23,7 @@
 
 #ifndef COMPILESTEP_H
 #define COMPILESTEP_H
-#include "../Design/VObject.h"
+#include "Design/VObject.h"
 namespace SURELOG {
 
 class CompileStep {
diff --git a/src/DesignCompile/CompileToolbox.cpp b/src/DesignCompile/CompileToolbox.cpp
index 195b9d8..43f25f4 100644
--- a/src/DesignCompile/CompileToolbox.cpp
+++ b/src/DesignCompile/CompileToolbox.cpp
@@ -20,24 +20,24 @@
  *
  * Created on June 13, 2018, 9:36 PM
  */
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/Signal.h"
-#include "../Design/FileContent.h"
-#include "../Design/ClockingBlock.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/Signal.h"
+#include "Design/FileContent.h"
+#include "Design/ClockingBlock.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
 #include "CompileToolbox.h"
 
diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
index 1615d6d..b181719 100644
--- a/src/DesignCompile/DesignElaboration.cpp
+++ b/src/DesignCompile/DesignElaboration.cpp
@@ -20,28 +20,28 @@
  *
  * Created on July 12, 2017, 8:55 PM
  */
-#include "../Utils/StringUtils.h"
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../Config/ConfigSet.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "Utils/StringUtils.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "Config/ConfigSet.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
-#include "../Testbench/Property.h"
-#include "../Design/Function.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/Property.h"
+#include "Design/Function.h"
+#include "Testbench/ClassDefinition.h"
 #include "DesignElaboration.h"
 #include <queue>
 
diff --git a/src/DesignCompile/DesignElaboration.h b/src/DesignCompile/DesignElaboration.h
index fe26346..ad47858 100644
--- a/src/DesignCompile/DesignElaboration.h
+++ b/src/DesignCompile/DesignElaboration.h
@@ -25,7 +25,7 @@
 #define DESIGNELABORATION_H
 
 #include "ElaborationStep.h"
-#include "../Expression/ExprBuilder.h"
+#include "Expression/ExprBuilder.h"
 
 namespace SURELOG {
 
diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp
index 743732e..ba4f8f1 100644
--- a/src/DesignCompile/ElaborationStep.cpp
+++ b/src/DesignCompile/ElaborationStep.cpp
@@ -21,24 +21,24 @@
  * Created on July 12, 2017, 8:55 PM
  */
 
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Utils/StringUtils.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Utils/StringUtils.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/ClassDefinition.h"
 #include "ElaborationStep.h"
 
 using namespace SURELOG;
diff --git a/src/DesignCompile/PackageAndRootElaboration.cpp b/src/DesignCompile/PackageAndRootElaboration.cpp
index 014bd5c..fb3da67 100644
--- a/src/DesignCompile/PackageAndRootElaboration.cpp
+++ b/src/DesignCompile/PackageAndRootElaboration.cpp
@@ -21,25 +21,25 @@
  * Created on June 3, 2019, 10:02 PM
  */
 
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
-#include "../Testbench/Property.h"
-#include "../Design/Function.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/Property.h"
+#include "Design/Function.h"
+#include "Testbench/ClassDefinition.h"
 #include "PackageAndRootElaboration.h"
 
 using namespace SURELOG;
diff --git a/src/DesignCompile/ResolveSymbols.cpp b/src/DesignCompile/ResolveSymbols.cpp
index 968b79e..c54ba76 100644
--- a/src/DesignCompile/ResolveSymbols.cpp
+++ b/src/DesignCompile/ResolveSymbols.cpp
@@ -20,23 +20,23 @@
  *
  * Created on July 1, 2017, 12:38 PM
  */
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../Testbench/Program.h"
-#include "../Testbench/ClassDefinition.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
+#include "Testbench/Program.h"
+#include "Testbench/ClassDefinition.h"
 #include "CompileDesign.h"
 #include "ResolveSymbols.h"
 
diff --git a/src/DesignCompile/ResolveSymbols.h b/src/DesignCompile/ResolveSymbols.h
index 60607d4..51667ea 100644
--- a/src/DesignCompile/ResolveSymbols.h
+++ b/src/DesignCompile/ResolveSymbols.h
@@ -23,8 +23,8 @@
 
 #ifndef RESOLVESYMBOLS_H
 #define RESOLVESYMBOLS_H
-#include "../Design/TimeInfo.h"
-#include "../Design/FileContent.h"
+#include "Design/TimeInfo.h"
+#include "Design/FileContent.h"
 #include "CompileStep.h"
 
 namespace SURELOG {
diff --git a/src/DesignCompile/TestbenchElaboration.cpp b/src/DesignCompile/TestbenchElaboration.cpp
index e06430e..a510f61 100644
--- a/src/DesignCompile/TestbenchElaboration.cpp
+++ b/src/DesignCompile/TestbenchElaboration.cpp
@@ -23,25 +23,25 @@
 
 #include <queue>
 
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
-#include "../Testbench/Property.h"
-#include "../Design/Function.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/Property.h"
+#include "Design/Function.h"
+#include "Testbench/ClassDefinition.h"
 #include "TestbenchElaboration.h"
 
 using namespace SURELOG;
diff --git a/src/DesignCompile/UVMElaboration.cpp b/src/DesignCompile/UVMElaboration.cpp
index ccb9ae2..3bec7de 100644
--- a/src/DesignCompile/UVMElaboration.cpp
+++ b/src/DesignCompile/UVMElaboration.cpp
@@ -21,25 +21,25 @@
  * Created on July 12, 2017, 8:56 PM
  */
 
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/VObject.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/ParseFile.h"
-#include "../SourceCompile/Compiler.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/VObject.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/Compiler.h"
 #include "CompileDesign.h"
-#include "../Testbench/Property.h"
-#include "../Design/Function.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/Property.h"
+#include "Design/Function.h"
+#include "Testbench/ClassDefinition.h"
 #include "UVMElaboration.h"
 
 using namespace SURELOG;
diff --git a/src/ErrorReporting/ErrorContainer.cpp b/src/ErrorReporting/ErrorContainer.cpp
index c42c802..756a8ef 100644
--- a/src/ErrorReporting/ErrorContainer.cpp
+++ b/src/ErrorReporting/ErrorContainer.cpp
@@ -25,13 +25,13 @@
 #include <mutex>
 #include <iostream>
 #include <fstream>
-#include "../CommandLine/CommandLineParser.hpp"
+#include "CommandLine/CommandLineParser.hpp"
 #include "Waiver.h"
 
 #include "antlr4-runtime.h"
 using namespace antlr4;
 
-#include "../API/PythonAPI.h"
+#include "API/PythonAPI.h"
 
 using namespace SURELOG;
 
diff --git a/src/ErrorReporting/ErrorDefinition.cpp b/src/ErrorReporting/ErrorDefinition.cpp
index a4dac29..9ec4d08 100644
--- a/src/ErrorReporting/ErrorDefinition.cpp
+++ b/src/ErrorReporting/ErrorDefinition.cpp
@@ -20,7 +20,7 @@
  *
  * Created on March 5, 2017, 11:25 PM
  */
-#include "../Utils/StringUtils.h"
+#include "Utils/StringUtils.h"
 #include "ErrorDefinition.h"
 
 using namespace SURELOG;
diff --git a/src/ErrorReporting/Location.h b/src/ErrorReporting/Location.h
index 8981136..747158e 100644
--- a/src/ErrorReporting/Location.h
+++ b/src/ErrorReporting/Location.h
@@ -24,7 +24,7 @@
 #ifndef LOCATION_H
 #define LOCATION_H
 
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 
 namespace SURELOG {
 
diff --git a/src/ErrorReporting/Report.cpp b/src/ErrorReporting/Report.cpp
index 6470ddf..eacf27a 100644
--- a/src/ErrorReporting/Report.cpp
+++ b/src/ErrorReporting/Report.cpp
@@ -21,9 +21,9 @@
  * Created on April 10, 2017, 8:56 PM
  */
 
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "ErrorContainer.h"
-#include "../CommandLine/CommandLineParser.hpp"
+#include "CommandLine/CommandLineParser.hpp"
 #include "Report.h"
 #include <iostream>
 #include <fstream>
diff --git a/src/Expression/ExprBuilder.cpp b/src/Expression/ExprBuilder.cpp
index 8e73877..1f46c83 100644
--- a/src/Expression/ExprBuilder.cpp
+++ b/src/Expression/ExprBuilder.cpp
@@ -20,9 +20,9 @@
  *
  * Created on November 2, 2017, 9:45 PM
  */
-#include "../ErrorReporting/ErrorContainer.h"
+#include "ErrorReporting/ErrorContainer.h"
 #include "ExprBuilder.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/VObjectTypes.h"
 #include <iostream>
 #include <sstream>
 
diff --git a/src/Expression/ExprBuilder.h b/src/Expression/ExprBuilder.h
index 67647c0..1a4c60d 100644
--- a/src/Expression/ExprBuilder.h
+++ b/src/Expression/ExprBuilder.h
@@ -23,12 +23,12 @@
 
 #ifndef EXPRBUILDER_H
 #define EXPRBUILDER_H
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 
 #include "Expr.h"
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../Design/ValuedComponentI.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "Design/ValuedComponentI.h"
 
 namespace SURELOG {
 
diff --git a/src/Library/AntlrLibParserErrorListener.cpp b/src/Library/AntlrLibParserErrorListener.cpp
index f7d09f9..dcf0824 100644
--- a/src/Library/AntlrLibParserErrorListener.cpp
+++ b/src/Library/AntlrLibParserErrorListener.cpp
@@ -24,10 +24,10 @@
 #include "atn/ParserATNSimulator.h"
 using namespace std;
 using namespace antlr4;
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "ParseLibraryDef.h"
 #include "AntlrLibParserErrorListener.h"
 using namespace SURELOG;
diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index 5f0fba3..571c2e6 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -20,9 +20,9 @@
  *
  * Created on January 27, 2018, 5:25 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../Design/ModuleDefinition.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "Design/ModuleDefinition.h"
 #include "Library.h"
 
 using namespace SURELOG;
diff --git a/src/Library/LibrarySet.cpp b/src/Library/LibrarySet.cpp
index 77285f7..6828a3f 100644
--- a/src/Library/LibrarySet.cpp
+++ b/src/Library/LibrarySet.cpp
@@ -23,8 +23,8 @@
 #include <vector>
 #include <set>
 #include <iostream>
-#include "../SourceCompile/SymbolTable.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "ErrorReporting/ErrorContainer.h"
 #include "LibrarySet.h"
 
 using namespace SURELOG;
diff --git a/src/Library/ParseLibraryDef.cpp b/src/Library/ParseLibraryDef.cpp
index ace4e5b..0281957 100644
--- a/src/Library/ParseLibraryDef.cpp
+++ b/src/Library/ParseLibraryDef.cpp
@@ -20,21 +20,21 @@
  *
  * Created on January 27, 2018, 5:05 PM
  */
-#include "../Utils/StringUtils.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
+#include "Utils/StringUtils.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
 #include "ParseLibraryDef.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/FileUtils.h"
 #include "antlr4-runtime.h"
 #include "atn/ParserATNSimulator.h"
 using namespace antlr4;
 using namespace SURELOG;
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
 #include "SVLibShapeListener.h"
 #include "AntlrLibParserErrorListener.h"
 
diff --git a/src/Library/ParseLibraryDef.h b/src/Library/ParseLibraryDef.h
index a0787fb..477cca6 100644
--- a/src/Library/ParseLibraryDef.h
+++ b/src/Library/ParseLibraryDef.h
@@ -24,8 +24,8 @@
 #ifndef PARSELIBRARYDEF_H
 #define PARSELIBRARYDEF_H
 #include "LibrarySet.h"
-#include "../Config/ConfigSet.h"
-#include "../Design/FileContent.h"
+#include "Config/ConfigSet.h"
+#include "Design/FileContent.h"
 
 namespace SURELOG {
 
diff --git a/src/Library/SVLibShapeListener.cpp b/src/Library/SVLibShapeListener.cpp
index c964143..c4ce8e1 100644
--- a/src/Library/SVLibShapeListener.cpp
+++ b/src/Library/SVLibShapeListener.cpp
@@ -20,21 +20,21 @@
  *
  * Created on January 28, 2018, 10:17 PM
  */
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../SourceCompile/CompilationUnit.h"
-#include "../SourceCompile/PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../SourceCompile/ParseFile.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
 #include "ParseLibraryDef.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/FileUtils.h"
 #include "antlr4-runtime.h"
 #include "atn/ParserATNSimulator.h"
 using namespace antlr4;
 #include "ParseLibraryDef.h"
 #include "SVLibShapeListener.h"
-#include "../Utils/FileUtils.h"
-#include "../Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
+#include "Utils/ParseUtils.h"
 using namespace SURELOG;
 
 SVLibShapeListener::SVLibShapeListener(ParseLibraryDef *parser,
diff --git a/src/Library/SVLibShapeListener.h b/src/Library/SVLibShapeListener.h
index 69bda6f..e1640ba 100644
--- a/src/Library/SVLibShapeListener.h
+++ b/src/Library/SVLibShapeListener.h
@@ -23,8 +23,8 @@
 
 #ifndef SVLIBSHAPELISTENER_H
 #define SVLIBSHAPELISTENER_H
-#include "../parser/SV3_1aParserBaseListener.h"
-#include "../SourceCompile/SV3_1aTreeShapeListener.h"
+#include "parser/SV3_1aParserBaseListener.h"
+#include "SourceCompile/SV3_1aTreeShapeListener.h"
 
 namespace SURELOG {
 
diff --git a/src/Package/Package.cpp b/src/Package/Package.cpp
index 9b8e9a2..fe13bd3 100644
--- a/src/Package/Package.cpp
+++ b/src/Package/Package.cpp
@@ -20,10 +20,10 @@
  *
  * Created on March 18, 2018, 7:58 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Expression/ExprBuilder.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Expression/ExprBuilder.h"
 #include "Package.h"
-#include "../Testbench/ClassDefinition.h"
+#include "Testbench/ClassDefinition.h"
 
 using namespace SURELOG;
 
diff --git a/src/Package/Package.h b/src/Package/Package.h
index 0328b82..308b7df 100644
--- a/src/Package/Package.h
+++ b/src/Package/Package.h
@@ -24,11 +24,11 @@
 #ifndef PACKAGE_H
 #define PACKAGE_H
 
-#include "../Library/Library.h"
-#include "../Design/FileContent.h"
-#include "../Design/DesignComponent.h"
-#include "../Design/ValuedComponentI.h"
-#include "../Design/DataType.h"
+#include "Library/Library.h"
+#include "Design/FileContent.h"
+#include "Design/DesignComponent.h"
+#include "Design/ValuedComponentI.h"
+#include "Design/DataType.h"
 
 namespace SURELOG {
 class CompilePackage;
diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp
index 7dc96cc..69b05a1 100644
--- a/src/SourceCompile/AnalyzeFile.cpp
+++ b/src/SourceCompile/AnalyzeFile.cpp
@@ -20,21 +20,21 @@
  *
  * Created on July 23, 2017, 11:05 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/TimeInfo.h"
-#include "../Design/DesignElement.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
 #include "IncludeFileInfo.h"
-#include "../Utils/StringUtils.h"
+#include "Utils/StringUtils.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
-#include "../SourceCompile/CompileSourceFile.h"
-#include "../SourceCompile/Compiler.h"
-#include "../Design/Design.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "Design/Design.h"
 #include "AnalyzeFile.h"
 #include <fstream>
 #include <stdio.h>
diff --git a/src/SourceCompile/AntlrParserErrorListener.cpp b/src/SourceCompile/AntlrParserErrorListener.cpp
index 5ebb124..3516919 100644
--- a/src/SourceCompile/AntlrParserErrorListener.cpp
+++ b/src/SourceCompile/AntlrParserErrorListener.cpp
@@ -25,15 +25,15 @@
 using namespace std;
 using namespace antlr4;
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
 #include "Compiler.h"
 #include "ParseFile.h"
-#include "../Utils/FileUtils.h"
-#include "../Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
+#include "Utils/StringUtils.h"
 #include "AntlrParserErrorListener.h"
 using namespace SURELOG;
 
diff --git a/src/SourceCompile/AntlrParserHandler.cpp b/src/SourceCompile/AntlrParserHandler.cpp
index 798ac3f..cc093c4 100644
--- a/src/SourceCompile/AntlrParserHandler.cpp
+++ b/src/SourceCompile/AntlrParserHandler.cpp
@@ -24,8 +24,8 @@
 #include "antlr4-runtime.h"
 using namespace std;
 using namespace antlr4;
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
 
 #include "AntlrParserHandler.h"
 
diff --git a/src/SourceCompile/CheckCompile.cpp b/src/SourceCompile/CheckCompile.cpp
index 8feed0a..481d102 100644
--- a/src/SourceCompile/CheckCompile.cpp
+++ b/src/SourceCompile/CheckCompile.cpp
@@ -23,19 +23,19 @@
 #include <iostream>
 #include <set>
 #include "SymbolTable.h"
-#include "../Design/TimeInfo.h"
-#include "../Design/DesignElement.h"
-#include "../Design/FileContent.h"
-#include "../ErrorReporting/Location.h"
-#include "../ErrorReporting/Error.h"
-#include "../ErrorReporting/ErrorDefinition.h"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
+#include "Design/FileContent.h"
+#include "ErrorReporting/Location.h"
+#include "ErrorReporting/Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
 #include "Compiler.h"
 #include "ParseFile.h"
-#include "../CommandLine/CommandLineParser.hpp"
+#include "CommandLine/CommandLineParser.hpp"
 #include "CheckCompile.h"
 
 using namespace SURELOG;
diff --git a/src/SourceCompile/CompilationUnit.h b/src/SourceCompile/CompilationUnit.h
index 9acd0a8..8a45e72 100644
--- a/src/SourceCompile/CompilationUnit.h
+++ b/src/SourceCompile/CompilationUnit.h
@@ -24,7 +24,7 @@
 #ifndef COMPILATIONUNIT_H
 #define COMPILATIONUNIT_H
 #include "MacroInfo.h"
-#include "../Design/TimeInfo.h"
+#include "Design/TimeInfo.h"
 
 namespace SURELOG {
 
diff --git a/src/SourceCompile/CompileSourceFile.cpp b/src/SourceCompile/CompileSourceFile.cpp
index 037313b..4348034 100644
--- a/src/SourceCompile/CompileSourceFile.cpp
+++ b/src/SourceCompile/CompileSourceFile.cpp
@@ -20,8 +20,8 @@
  *
  * Created on February 20, 2017, 9:54 PM
  */
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "SymbolTable.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
@@ -29,15 +29,15 @@
 
 #include "antlr4-runtime.h"
 using namespace antlr4;
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
 
 #include "AntlrParserHandler.h"
 
 #include "CompileSourceFile.h"
 #include "Compiler.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/StringUtils.h"
+#include "Utils/FileUtils.h"
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
@@ -46,9 +46,9 @@
 using namespace std;
 #include "PreprocessFile.h"
 #include "ParseFile.h"
-#include "../API/PythonAPI.h"
+#include "API/PythonAPI.h"
 #include "PythonListen.h"
-#include "../Package/Precompiled.h"
+#include "Package/Precompiled.h"
 
 using namespace SURELOG;
 
diff --git a/src/SourceCompile/Compiler.cpp b/src/SourceCompile/Compiler.cpp
index c3823f8..e09157d 100644
--- a/src/SourceCompile/Compiler.cpp
+++ b/src/SourceCompile/Compiler.cpp
@@ -20,8 +20,8 @@
  *
  * Created on March 4, 2017, 5:16 PM
  */
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "SymbolTable.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
@@ -30,17 +30,17 @@
 #include "Compiler.h"
 #include "CheckCompile.h"
 #include "antlr4-runtime.h"
-#include "../DesignCompile/CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
 #include "AnalyzeFile.h"
-#include "../Library/ParseLibraryDef.h"
-#include "../Utils/FileUtils.h"
-#include "../Package/Precompiled.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/Timer.h"
+#include "Library/ParseLibraryDef.h"
+#include "Utils/FileUtils.h"
+#include "Package/Precompiled.h"
+#include "Utils/StringUtils.h"
+#include "Utils/Timer.h"
 #include "math.h"
 using namespace antlr4;
 
-#include "../API/PythonAPI.h"
+#include "API/PythonAPI.h"
 #include "CheckCompile.h"
 #include <mutex>
 #include <thread>
diff --git a/src/SourceCompile/Compiler.h b/src/SourceCompile/Compiler.h
index 3743070..6b6ad10 100644
--- a/src/SourceCompile/Compiler.h
+++ b/src/SourceCompile/Compiler.h
@@ -28,9 +28,9 @@
 #include <set>
 #include <map>
 #include <thread>
-#include "../Design/Design.h"
-#include "../Library/LibrarySet.h"
-#include "../Config/ConfigSet.h"
+#include "Design/Design.h"
+#include "Library/LibrarySet.h"
+#include "Config/ConfigSet.h"
 #include "PreprocessFile.h"
 
 #ifdef USETBB
diff --git a/src/SourceCompile/ParseFile.cpp b/src/SourceCompile/ParseFile.cpp
index 1ea5024..b8ef0b7 100644
--- a/src/SourceCompile/ParseFile.cpp
+++ b/src/SourceCompile/ParseFile.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
@@ -39,19 +39,19 @@
 using namespace antlr4;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
-#include "../parser/SV3_1aParserBaseListener.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
+#include "parser/SV3_1aParserBaseListener.h"
 #include "SV3_1aTreeShapeListener.h"
-#include "../API/SV3_1aPythonListener.h"
+#include "API/SV3_1aPythonListener.h"
 using namespace antlr4;
-#include "../Utils/ParseUtils.h"
-#include "../Utils/FileUtils.h"
-#include "../Cache/ParseCache.h"
+#include "Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
+#include "Cache/ParseCache.h"
 #include "AntlrParserErrorListener.h"
-#include "../Package/Precompiled.h"
-#include "../Utils/StringUtils.h"
-#include "../Utils/Timer.h"
+#include "Package/Precompiled.h"
+#include "Utils/StringUtils.h"
+#include "Utils/Timer.h"
 ParseFile::ParseFile(SymbolId fileId, SymbolTable* symbolTable,
                      ErrorContainer* errors)
     : m_fileId(fileId),
diff --git a/src/SourceCompile/ParseFile.h b/src/SourceCompile/ParseFile.h
index 9a959fa..0d1276e 100644
--- a/src/SourceCompile/ParseFile.h
+++ b/src/SourceCompile/ParseFile.h
@@ -25,10 +25,10 @@
 #define PARSEFILE_H
 #include <string>
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
 #include "AntlrParserHandler.h"
-#include "../Design/FileContent.h"
+#include "Design/FileContent.h"
 
 namespace SURELOG {
 
diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp
index 92ac6a2..4820fc9 100644
--- a/src/SourceCompile/PreprocessFile.cpp
+++ b/src/SourceCompile/PreprocessFile.cpp
@@ -21,15 +21,15 @@
  * Created on February 24, 2017, 9:38 PM
  */
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
 #include "Compiler.h"
-#include "../Utils/StringUtils.h"
-#include "../Cache/PPCache.h"
-#include "../ErrorReporting/Waiver.h"
+#include "Utils/StringUtils.h"
+#include "Cache/PPCache.h"
+#include "ErrorReporting/Waiver.h"
 #include <cstdlib>
 #include <iostream>
 #include <regex>
@@ -38,12 +38,12 @@
 using namespace std;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aPpLexer.h"
-#include "../parser/SV3_1aPpParser.h"
-#include "../parser/SV3_1aPpParserBaseListener.h"
+#include "parser/SV3_1aPpLexer.h"
+#include "parser/SV3_1aPpParser.h"
+#include "parser/SV3_1aPpParserBaseListener.h"
 using namespace antlr4;
-#include "../Utils/ParseUtils.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
 #include "antlr4-runtime.h"
 #include "atn/ParserATNSimulator.h"
 #include "Parser.h"
diff --git a/src/SourceCompile/PreprocessFile.h b/src/SourceCompile/PreprocessFile.h
index e45f6c6..8a39f15 100644
--- a/src/SourceCompile/PreprocessFile.h
+++ b/src/SourceCompile/PreprocessFile.h
@@ -29,10 +29,10 @@
 #include <set>
 #include <stack>
 
-#include "../parser/SV3_1aPpLexer.h"
-#include "../parser/SV3_1aPpParser.h"
+#include "parser/SV3_1aPpLexer.h"
+#include "parser/SV3_1aPpParser.h"
 #include "CompilationUnit.h"
-#include "../Library/Library.h"
+#include "Library/Library.h"
 #include "LoopCheck.h"
 #include "IncludeFileInfo.h"
 
diff --git a/src/SourceCompile/PythonListen.cpp b/src/SourceCompile/PythonListen.cpp
index dccadcc..2c36419 100644
--- a/src/SourceCompile/PythonListen.cpp
+++ b/src/SourceCompile/PythonListen.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
@@ -37,13 +37,13 @@
 using namespace antlr4;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
-#include "../parser/SV3_1aParserBaseListener.h"
-#include "../API/SV3_1aPythonListener.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
+#include "parser/SV3_1aParserBaseListener.h"
+#include "API/SV3_1aPythonListener.h"
 
 #include "PythonListen.h"
-#include "../Cache/PythonAPICache.h"
+#include "Cache/PythonAPICache.h"
 
 using namespace SURELOG;
 
diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
index 9a7712b..696bbb6 100644
--- a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
@@ -15,15 +15,15 @@
  */
 
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "SymbolTable.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
 #include "Compiler.h"
 #include "PreprocessFile.h"
-#include "../Utils/StringUtils.h"
+#include "Utils/StringUtils.h"
 
 #include <cstdlib>
 #include <iostream>
@@ -32,12 +32,12 @@
 using namespace std;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aPpLexer.h"
-#include "../parser/SV3_1aPpParser.h"
-#include "../parser/SV3_1aPpParserBaseListener.h"
+#include "parser/SV3_1aPpLexer.h"
+#include "parser/SV3_1aPpParser.h"
+#include "parser/SV3_1aPpParserBaseListener.h"
 using namespace antlr4;
-#include "../Utils/ParseUtils.h"
-#include "../Utils/FileUtils.h"
+#include "Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
 
 #include "SV3_1aPpTreeShapeListener.h"
 
diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.h b/src/SourceCompile/SV3_1aPpTreeShapeListener.h
index 493d198..ad34032 100644
--- a/src/SourceCompile/SV3_1aPpTreeShapeListener.h
+++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.h
@@ -30,7 +30,7 @@
 #include "Compiler.h"
 #include "SymbolTable.h"
 #include "CompilationUnit.h"
-#include "../Design/TimeInfo.h"
+#include "Design/TimeInfo.h"
 
 namespace SURELOG {
 
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
index d2ea889..c1f66bb 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
@@ -22,8 +22,8 @@
  */
 
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
@@ -37,12 +37,12 @@
 using namespace antlr4;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
-#include "../parser/SV3_1aParserBaseListener.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
+#include "parser/SV3_1aParserBaseListener.h"
 #include "SV3_1aTreeShapeHelper.h"
 using namespace antlr4;
-#include "../Utils/ParseUtils.h"
+#include "Utils/ParseUtils.h"
 #include "SV3_1aTreeShapeHelper.h"
 
 SV3_1aTreeShapeHelper::SV3_1aTreeShapeHelper(ParseFile* pf,
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.h b/src/SourceCompile/SV3_1aTreeShapeHelper.h
index 3e7e4d4..091a418 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.h
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -26,16 +26,16 @@
 #include <stack>
 #include <map>
 #include <unordered_map>
-#include "../Utils/ParseUtils.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/TimeInfo.h"
-#include "../Design/DesignElement.h"
-#include "../Design/FileContent.h"
+#include "Utils/ParseUtils.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
+#include "Design/FileContent.h"
 #include "ParseFile.h"
 #include "CompilationUnit.h"
 #include "CompileSourceFile.h"
 #include "VObjectTypes.h"
-#include "../Library/ParseLibraryDef.h"
+#include "Library/ParseLibraryDef.h"
 #include "IncludeFileInfo.h"
 
 namespace SURELOG {
diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
index 2cde537..803a256 100644
--- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
@@ -22,14 +22,14 @@
  */
 
 #include "SymbolTable.h"
-#include "../CommandLine/CommandLineParser.hpp"
-#include "../ErrorReporting/ErrorContainer.h"
+#include "CommandLine/CommandLineParser.hpp"
+#include "ErrorReporting/ErrorContainer.h"
 #include "CompilationUnit.h"
 #include "PreprocessFile.h"
 #include "CompileSourceFile.h"
 #include "Compiler.h"
 #include "ParseFile.h"
-#include "../Utils/StringUtils.h"
+#include "Utils/StringUtils.h"
 
 #include <cstdlib>
 #include <iostream>
@@ -40,12 +40,12 @@
 using namespace antlr4;
 using namespace SURELOG;
 
-#include "../parser/SV3_1aLexer.h"
-#include "../parser/SV3_1aParser.h"
-#include "../parser/SV3_1aParserBaseListener.h"
-#include "../parser/SV3_1aPpParserBaseListener.h"
-#include "../Utils/ParseUtils.h"
-#include "../Utils/FileUtils.h"
+#include "parser/SV3_1aLexer.h"
+#include "parser/SV3_1aParser.h"
+#include "parser/SV3_1aParserBaseListener.h"
+#include "parser/SV3_1aPpParserBaseListener.h"
+#include "Utils/ParseUtils.h"
+#include "Utils/FileUtils.h"
 #include "SV3_1aPpTreeShapeListener.h"
 #include "SV3_1aTreeShapeListener.h"
 #include "SV3_1aTreeShapeHelper.h"
diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.h b/src/SourceCompile/SV3_1aTreeShapeListener.h
index a5fa546..ae281c3 100644
--- a/src/SourceCompile/SV3_1aTreeShapeListener.h
+++ b/src/SourceCompile/SV3_1aTreeShapeListener.h
@@ -30,11 +30,11 @@
 #include <stack>
 #include <map>
 #include <unordered_map>
-#include "../Utils/ParseUtils.h"
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/TimeInfo.h"
-#include "../Design/DesignElement.h"
-#include "../Design/FileContent.h"
+#include "Utils/ParseUtils.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
+#include "Design/FileContent.h"
 #include "ParseFile.h"
 #include "CompilationUnit.h"
 #include "CompileSourceFile.h"
diff --git a/src/SourceCompile/VObjectTypes.cpp b/src/SourceCompile/VObjectTypes.cpp
index 50ded84..97180f4 100644
--- a/src/SourceCompile/VObjectTypes.cpp
+++ b/src/SourceCompile/VObjectTypes.cpp
@@ -1,6 +1,6 @@
 
 #include <string>
-#include "../Design/VObject.h"
+#include "Design/VObject.h"
 // This file is automatically generated by generate_parser_listener.tcl
 // DO NOT EDIT
 
diff --git a/src/Testbench/ClassDefinition.cpp b/src/Testbench/ClassDefinition.cpp
index 1e74713..ae1c0b1 100644
--- a/src/Testbench/ClassDefinition.cpp
+++ b/src/Testbench/ClassDefinition.cpp
@@ -20,8 +20,8 @@
  *
  * Created on June 1, 2018, 10:12 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 #include "ClassDefinition.h"
 
 using namespace SURELOG;
diff --git a/src/Testbench/ClassDefinition.h b/src/Testbench/ClassDefinition.h
index b563279..737b822 100644
--- a/src/Testbench/ClassDefinition.h
+++ b/src/Testbench/ClassDefinition.h
@@ -24,16 +24,16 @@
 #ifndef CLASSDEFINITION_H
 #define CLASSDEFINITION_H
 
-#include "../Design/DesignComponent.h"
-#include "../Design/ValuedComponentI.h"
-#include "../Design/DataType.h"
+#include "Design/DesignComponent.h"
+#include "Design/ValuedComponentI.h"
+#include "Design/DataType.h"
 #include "Property.h"
 #include "FunctionMethod.h"
 #include "TaskMethod.h"
 #include "Constraint.h"
 #include "TypeDef.h"
 #include "CoverGroupDefinition.h"
-#include "../Design/Parameter.h"
+#include "Design/Parameter.h"
 
 namespace SURELOG {
 class CompileClass;
diff --git a/src/Testbench/ClassObject.cpp b/src/Testbench/ClassObject.cpp
index 2c66d7e..9343509 100644
--- a/src/Testbench/ClassObject.cpp
+++ b/src/Testbench/ClassObject.cpp
@@ -20,8 +20,8 @@
  *
  * Created on March 24, 2019, 7:38 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
 #include "ClassObject.h"
 
 using namespace SURELOG;
diff --git a/src/Testbench/ClassObject.h b/src/Testbench/ClassObject.h
index 31617b9..19ee625 100644
--- a/src/Testbench/ClassObject.h
+++ b/src/Testbench/ClassObject.h
@@ -25,7 +25,7 @@
 #define CLASSOBJECT_H
 
 #include "ClassDefinition.h"
-#include "../Expression/Value.h"
+#include "Expression/Value.h"
 
 namespace SURELOG {
 
diff --git a/src/Testbench/Constraint.h b/src/Testbench/Constraint.h
index fae7380..82dc2e6 100644
--- a/src/Testbench/Constraint.h
+++ b/src/Testbench/Constraint.h
@@ -24,9 +24,9 @@
 #ifndef CONSTRAINT_H
 #define CONSTRAINT_H
 
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/VObjectTypes.h"
 
 namespace SURELOG {
 
diff --git a/src/Testbench/CoverGroupDefinition.h b/src/Testbench/CoverGroupDefinition.h
index fca7cb8..6767d44 100644
--- a/src/Testbench/CoverGroupDefinition.h
+++ b/src/Testbench/CoverGroupDefinition.h
@@ -24,9 +24,9 @@
 #ifndef COVERGROUPDEFINITION_H
 #define COVERGROUPDEFINITION_H
 
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../SourceCompile/VObjectTypes.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "SourceCompile/VObjectTypes.h"
 
 namespace SURELOG {
 
diff --git a/src/Testbench/FunctionMethod.h b/src/Testbench/FunctionMethod.h
index e08c2dd..cb959fc 100644
--- a/src/Testbench/FunctionMethod.h
+++ b/src/Testbench/FunctionMethod.h
@@ -24,7 +24,7 @@
 #ifndef FUNCTIONMETHOD_H
 #define FUNCTIONMETHOD_H
 
-#include "../Design/Function.h"
+#include "Design/Function.h"
 
 namespace SURELOG {
 
diff --git a/src/Testbench/Program.cpp b/src/Testbench/Program.cpp
index 66ebbd0..71faeeb 100644
--- a/src/Testbench/Program.cpp
+++ b/src/Testbench/Program.cpp
@@ -20,9 +20,9 @@
  *
  * Created on June 1, 2018, 8:58 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../Design/DesignComponent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "Design/DesignComponent.h"
 #include "Program.h"
 
 using namespace SURELOG;
diff --git a/src/Testbench/Program.h b/src/Testbench/Program.h
index 751479d..f9f9ed3 100644
--- a/src/Testbench/Program.h
+++ b/src/Testbench/Program.h
@@ -23,8 +23,8 @@
 
 #ifndef PROGRAM_H
 #define PROGRAM_H
-#include "../Design/DesignComponent.h"
-#include "../Common/ClockingBlockHolder.h"
+#include "Design/DesignComponent.h"
+#include "Common/ClockingBlockHolder.h"
 
 namespace SURELOG {
 
diff --git a/src/Testbench/Property.cpp b/src/Testbench/Property.cpp
index b907612..1918de6 100644
--- a/src/Testbench/Property.cpp
+++ b/src/Testbench/Property.cpp
@@ -20,9 +20,9 @@
  *
  * Created on January 23, 2019, 9:17 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../Design/DesignComponent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "Design/DesignComponent.h"
 #include "Property.h"
 
 using namespace SURELOG;
diff --git a/src/Testbench/Property.h b/src/Testbench/Property.h
index 4df6f7f..c933216 100644
--- a/src/Testbench/Property.h
+++ b/src/Testbench/Property.h
@@ -24,7 +24,7 @@
 #ifndef PROPERTY_H
 #define PROPERTY_H
 
-#include "../Design/DataType.h"
+#include "Design/DataType.h"
 #include "Variable.h"
 
 namespace SURELOG {
diff --git a/src/Testbench/TaskMethod.h b/src/Testbench/TaskMethod.h
index f04390c..dde1bcd 100644
--- a/src/Testbench/TaskMethod.h
+++ b/src/Testbench/TaskMethod.h
@@ -24,7 +24,7 @@
 #ifndef TASKMETHOD_H
 #define TASKMETHOD_H
 
-#include "../Design/Task.h"
+#include "Design/Task.h"
 
 namespace SURELOG {
 
diff --git a/src/Testbench/TypeDef.cpp b/src/Testbench/TypeDef.cpp
index 3cdcd16..e75a792 100644
--- a/src/Testbench/TypeDef.cpp
+++ b/src/Testbench/TypeDef.cpp
@@ -20,9 +20,9 @@
  *
  * Created on March 6, 2019, 9:14 PM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../SourceCompile/VObjectTypes.h"
-#include "../Design/FileContent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/VObjectTypes.h"
+#include "Design/FileContent.h"
 #include "TypeDef.h"
 
 using namespace SURELOG;
diff --git a/src/Testbench/TypeDef.h b/src/Testbench/TypeDef.h
index 088e3fe..ff5d770 100644
--- a/src/Testbench/TypeDef.h
+++ b/src/Testbench/TypeDef.h
@@ -25,8 +25,8 @@
 #define TYPEDEF_H
 
 #include <string>
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/DataType.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/DataType.h"
 
 namespace SURELOG {
 class FileContent;
diff --git a/src/Testbench/Variable.cpp b/src/Testbench/Variable.cpp
index 1901e72..72b712b 100644
--- a/src/Testbench/Variable.cpp
+++ b/src/Testbench/Variable.cpp
@@ -20,9 +20,9 @@
  *
  * Created on May 26, 2019, 10:42 AM
  */
-#include "../SourceCompile/SymbolTable.h"
-#include "../Design/FileContent.h"
-#include "../Design/DesignComponent.h"
+#include "SourceCompile/SymbolTable.h"
+#include "Design/FileContent.h"
+#include "Design/DesignComponent.h"
 #include "Variable.h"
 
 using namespace SURELOG;
diff --git a/src/Utils/FileUtils.cpp b/src/Utils/FileUtils.cpp
index 3d0807c..ed68c8f 100644
--- a/src/Utils/FileUtils.cpp
+++ b/src/Utils/FileUtils.cpp
@@ -21,7 +21,7 @@
  * Created on March 16, 2017, 11:02 PM
  */
 
-#include "../SourceCompile/SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
 #include "FileUtils.h"
 #include "StringUtils.h"
 #include <sys/stat.h>