separate and rename modules