Update Makefile, move files around