Put methods in correct class