Refactor, all in packages