Reorganization to more typical project structure

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "includes/cxxopts"]
-	path = includes/cxxopts
+	path = lib/cxxopts
 	url = https://github.com/jarro2783/cxxopts.git
 [submodule "includes/Catch"]
-	path = includes/Catch
+	path = lib/Catch
 	url = https://github.com/philsquared/Catch.git

Makefile

@@ -1,12 +1,12 @@
 EX=reflex2q3
 CC=g++
-CFLAGS=-std=c++11 -I"./src" -I"./includes" -I"./includes/Catch/single_include" -I"./includes/cxxopts/include" -I"/usr/include/eigen3"
+CFLAGS=-std=c++11 -I"include" -I"lib/Catch/single_include" -I"lib/cxxopts/include" -I"/usr/include/eigen3"
-TESTEX=runtests
+TESTEX=bin/runtests
 
 all: main test
 
 main: planes.o brushdef.o oopless-parser.o EntityConverter.o
-	$(CC) $^ src/main.cpp $(CFLAGS) -o $(EX) #2>error8.log
+	$(CC) $^ src/main.cpp $(CFLAGS) -o $(EX) 
 
 test:  planes.o brushdef.o oopless-parser.o EntityConverter.o catch.o
 	$(CC) $^ $(CFLAGS) -o $(TESTEX)