Reorganized files

unit_tests/Makefile

 INCLUDEDIR = /Users/pascal/rbcomb_simulation/include
+LIBDIR = /Users/pascal/rbcomb_simulation/lib
 
 CXX = /usr/local/bin/g++-9
-CXXFLAGS = -std=c++2a -Wall -Wpedantic -I$(INCLUDEDIR) -O5 -mtune=native -march=native
+CXXFLAGS = -std=c++2a -Wall -Wpedantic -I$(INCLUDEDIR) -I$(LIBDIR) -O5 -mtune=native -march=native
 
 run: all
 	@echo "\n\n\nRunning Unit Tests!\n"
@@ -33,28 +34,28 @@ run: all
 
 all: main_vec2 main_vortex main_drum main_lattice_generation main_system main_system_stepper main_system_coupling
 
-main_vec2: main_vec2.cpp $(INCLUDEDIR)/vec2.hpp
+main_vec2: main_vec2.cpp $(LIBDIR)/vec2.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
 main_vortex: main_vortex.cpp $(INCLUDEDIR)/vortex.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
-main_drum: main_drum.cpp $(INCLUDEDIR)/drum.hpp $(INCLUDEDIR)/drum_parameters.hpp
+main_drum: main_drum.cpp $(LIBDIR)/drum.hpp $(LIBDIR)/drum_parameters.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
-#main_force: main_force.cpp $(INCLUDEDIR)/force.hpp $(INCLUDEDIR)/force_simple.hpp
+#main_force: main_force.cpp $(LIBDIR)/force.hpp $(INCLUDEDIR)/force_simple.hpp
 #	$(CXX) $< $(CXXFLAGS) -o $@
 
-main_lattice_generation: main_lattice_generation.cpp $(INCLUDEDIR)/lattice_generator.hpp $(INCLUDEDIR)/rbcomb_generator.hpp $(INCLUDEDIR)/drum.hpp $(INCLUDEDIR)/drum_parameters.hpp $(INCLUDEDIR)/drum_variables.hpp $(INCLUDEDIR)/rk4_buffer.hpp
+main_lattice_generation: main_lattice_generation.cpp $(LIBDIR)/lattice_generator.hpp $(INCLUDEDIR)/rbcomb_generator.hpp $(LIBDIR)/drum.hpp $(LIBDIR)/drum_parameters.hpp $(LIBDIR)/drum_variables.hpp $(LIBDIR)/rk4_buffer.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
-main_system: main_system.cpp ${INCLUDEDIR}/system.hpp ${INCLUDEDIR}/rbcomb_generator.hpp ${INCLUDEDIR}/drum.hpp ${INCLUDEDIR}/drum_parameters.hpp ${INCLUDEDIR}/drum_variables.hpp ${INCLUDEDIR}/system_parameters.hpp ${INCLUDEDIR}/rk4_stepper.hpp ${INCLUDEDIR}/vec2.hpp ${INCLUDEDIR}/driver_simple.hpp ${INCLUDEDIR}/coupler_simple.hpp ${INCLUDEDIR}/force_simple.hpp ${INCLUDEDIR}/rk4_buffer.hpp ${INCLUDEDIR}/grabber.hpp
+main_system: main_system.cpp ${LIBDIR}/system.hpp ${INCLUDEDIR}/rbcomb_generator.hpp ${LIBDIR}/drum.hpp ${LIBDIR}/drum_parameters.hpp ${LIBDIR}/drum_variables.hpp ${LIBDIR}/system_parameters.hpp ${LIBDIR}/rk4_stepper.hpp ${LIBDIR}/vec2.hpp ${INCLUDEDIR}/driver_simple.hpp ${INCLUDEDIR}/coupler_simple.hpp ${INCLUDEDIR}/force_simple.hpp ${LIBDIR}/rk4_buffer.hpp ${LIBDIR}/grabber.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
-main_system_stepper: main_system_stepper.cpp ${INCLUDEDIR}/system.hpp ${INCLUDEDIR}/rbcomb_generator.hpp ${INCLUDEDIR}/drum.hpp ${INCLUDEDIR}/drum_parameters.hpp ${INCLUDEDIR}/drum_variables.hpp ${INCLUDEDIR}/system_parameters.hpp ${INCLUDEDIR}/rk4_stepper.hpp ${INCLUDEDIR}/vec2.hpp ${INCLUDEDIR}/driver_simple.hpp ${INCLUDEDIR}/coupler_simple.hpp ${INCLUDEDIR}/force_simple.hpp ${INCLUDEDIR}/rk4_buffer.hpp ${INCLUDEDIR}/grabber.hpp
+main_system_stepper: main_system_stepper.cpp ${LIBDIR}/system.hpp ${INCLUDEDIR}/rbcomb_generator.hpp ${LIBDIR}/drum.hpp ${LIBDIR}/drum_parameters.hpp ${LIBDIR}/drum_variables.hpp ${LIBDIR}/system_parameters.hpp ${LIBDIR}/rk4_stepper.hpp ${LIBDIR}/vec2.hpp ${INCLUDEDIR}/driver_simple.hpp ${INCLUDEDIR}/coupler_simple.hpp ${INCLUDEDIR}/force_simple.hpp ${LIBDIR}/rk4_buffer.hpp ${LIBDIR}/grabber.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
-main_system_coupling: main_system_coupling.cpp ${INCLUDEDIR}/system.hpp ${INCLUDEDIR}/line_generator.hpp ${INCLUDEDIR}/drum.hpp ${INCLUDEDIR}/drum_parameters.hpp ${INCLUDEDIR}/drum_variables.hpp ${INCLUDEDIR}/system_parameters.hpp ${INCLUDEDIR}/rk4_stepper.hpp ${INCLUDEDIR}/vec2.hpp ${INCLUDEDIR}/driver_single.hpp ${INCLUDEDIR}/coupler_constant.hpp ${INCLUDEDIR}/force_simple.hpp ${INCLUDEDIR}/rk4_buffer.hpp ${INCLUDEDIR}/grabber.hpp
+main_system_coupling: main_system_coupling.cpp ${LIBDIR}/system.hpp ${INCLUDEDIR}/line_generator.hpp ${LIBDIR}/drum.hpp ${LIBDIR}/drum_parameters.hpp ${LIBDIR}/drum_variables.hpp ${LIBDIR}/system_parameters.hpp ${LIBDIR}/rk4_stepper.hpp ${LIBDIR}/vec2.hpp ${INCLUDEDIR}/driver_single.hpp ${INCLUDEDIR}/coupler_constant.hpp ${INCLUDEDIR}/force_simple.hpp ${LIBDIR}/rk4_buffer.hpp ${LIBDIR}/grabber.hpp
 	$(CXX) $< $(CXXFLAGS) -o $@
 
 clean: