Moved the modules to the right folder