Cleaned up directory structure, supped up Makefile