Moved files around
Fixed Makefile for new file locations