Move some code to another package