Move code between classes