Moving classes between packages