ACT-1786
Refactoring of packages, in order to avoid multiple modules having some
class sharing the same package name