Several updates to the project's structure
Fixes to the Makefile