Changed makefiles to work with new modules in build system