File structure overhaul, redid Makefile