Small refactoring of package structure