refactor build using import-modules