Removed obsolete config file folders
Fixed bug in Makefile