Small refactoring (new modules names and packages)