move methods to child classes

final commit