massive refactoring of the package/module structure