Refactor to different Package