restructure Makefile to avoid concurrent makefile generation
use the correct makefile names for building the project