Further reduced the framework to only include Makefiles.