Re-organized makefiles