continue refactoring of package structure and organized imports