Moving methods to right classes
Moving methods to right classes