Modified structure of modules, redefined a little bit the philosofy of the project