[REF] Split and rename modules