Implement new method helpers and package re-org