restructuring - updated Makefiles