Refactor package layout.