Reorganize the code

[carlosggarcia]

As the code is growing we will increasingly need a better a more flexible organization of the code.