Moving classes to the right place