Cleaned up makefiles a lot