Moving classes into design