rearranged makefiles
regenerated