Rename modules
Fix module names. Move class