Re-structuring directories and makefiles a bit.
More makefile restructuring.
More restructuring directories/Makefiles. Done for now.