Tidy up Makefiles, removed uneccesary modules from build to have a good starting point