m0dulo
diff --git a/‎CMakeLists.txt
Lines changed: 14 additions & 2 deletions b/‎CMakeLists.txt
Lines changed: 14 additions & 2 deletions
diff --git a/‎src/binaryFileParser.cpp renamed to ‎src/code/binaryFileParser.cpp b/‎src/binaryFileParser.cpp renamed to ‎src/code/binaryFileParser.cpp
diff --git a/‎src/binaryFileParser.hpp renamed to ‎src/code/binaryFileParser.hpp
Lines changed: 6 additions & 6 deletions b/‎src/binaryFileParser.hpp renamed to ‎src/code/binaryFileParser.hpp
Lines changed: 6 additions & 6 deletions
diff --git a/‎src/codeObject.cpp renamed to ‎src/code/codeObject.cpp b/‎src/codeObject.cpp renamed to ‎src/code/codeObject.cpp
diff --git a/‎src/codeObject.hpp renamed to ‎src/code/codeObject.hpp
Lines changed: 1 addition & 1 deletion b/‎src/codeObject.hpp renamed to ‎src/code/codeObject.hpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main.cpp
Lines changed: 2 additions & 2 deletions b/‎src/main.cpp
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/lyxInteger.cpp renamed to ‎src/object/lyxInteger.cpp b/‎src/lyxInteger.cpp renamed to ‎src/object/lyxInteger.cpp
diff --git a/‎src/lyxInteger.hpp renamed to ‎src/object/lyxInteger.hpp b/‎src/lyxInteger.hpp renamed to ‎src/object/lyxInteger.hpp
diff --git a/‎src/lyxObject.hpp renamed to ‎src/object/lyxObject.hpp b/‎src/lyxObject.hpp renamed to ‎src/object/lyxObject.hpp
diff --git a/‎src/lyxString.cpp renamed to ‎src/object/lyxString.cpp b/‎src/lyxString.cpp renamed to ‎src/object/lyxString.cpp
@@ -1,10 +1,22 @@
 cmake_minimum_required(VERSION 3.0)
+
 project(LyxPythonVM)
+
 set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -g -w -msse3 -funroll-loops  -std=c++11 -O0 -pg" )
 else()
     SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fPIC -funroll-loops -w -std=c++11 -O2 -march=native" )
 endif()
-set(SRC ${PROJECT_SOURCE_DIR}/src/main.cpp)
-add_executable(main ${SRC})
+
+include_directories(src/)
+
+set(SRCS src/main.cpp
+    src/code/binaryFileParser.cpp
+    src/code/codeObject.cpp
+    src/object/lyxInteger.cpp
+    src/object/lyxString.cpp
+    src/util/arrayList.cpp)
+
+add_executable(vm ${SRCS})
@@ -1,12 +1,12 @@
 #ifndef BINARY_FILE_PARSER_HPP
 #define BINARY_FILE_PARSER_HPP
 
-#include "arrayList.hpp"
-#include "bufferedInputStream.hpp"
-#include "codeObject.hpp"
-#include "lyxInteger.hpp"
-#include "lyxObject.hpp"
-#include "lyxString.hpp"
+#include "util/bufferedInputStream.hpp"
+#include "util/arrayList.hpp"
+#include "object/lyxObject.hpp"
+#include "object/lyxInteger.hpp"
+#include "object/lyxString.hpp"
+#include "code/codeObject.hpp"
 
 class BinaryFileParser {
 private:
 
@@ -1,7 +1,7 @@
 #ifndef CODE_OBJECT_HPP
 #define CODE_OBJECT_HPP
 
-#include "lyxObject.hpp"
+#include "object/lyxObject.hpp"
 
 class LyxString;
 
 
@@ -1,5 +1,5 @@
-#include "bufferedInputStream.hpp"
-#include "binaryFileParser.hpp"
+#include "util/bufferedInputStream.hpp"
+#include "code/binaryFileParser.hpp"
 
 int main(int argc, char **argv) {
   if (argc <= 1) {