Reorganizing the modules folders