Refactor package structure to parent level