moved modules to makefile