+ Finished basic Refactoring.
+ Added Makefile