File structure overhaul, redid Makefile
More file cleanup