Major rework on includes system
Update Makefile -- tests are not passing now