Improve package modularity

[davide-f]

We shall consider to improve the modularity of the package by adding modules to simplify and better maintain the package.
This is not a priority but mentioning to keep this in mind. It is linked to the restructuring