Updated makefiles to fit to the new structure