Added a Makefile and a new dir structure.
Also cleaned up some errors.