Moved some modules

Is this how it's done?