Updated build script to refactoring of modules.