Organized some things and added a GNU Makefile