Tidied up Makefiles and directory structure.
Removing user-specific configuration.