Moving code to a package