Cleaning

* The names of the modules follow the same pattern
* Useless code and files have been deleted