rename modules to modules structure