Update build system: remove nested makefile