update makefiles to run with new (modular) setup