Cleaned up old files, moved things around, updated Makefile