Move code into a package