continued on refactoring package structure