* adapted Makefiles to core restructuring