Did some cleaning and reorganizing
Sorted the Makefile drama out