Reverted Makefile change
Moved stuff to subdirs