rearranged makefiles to simplify project makefile