Restructured a few things. Updated makefile and readme.