Cleaned up the package structure, made a Makefile.