Move many things and start to tweak the Makefile
Moving things around
Reorganization, improved Makefile