Move method-classes to separate files

 - Works better with coverage-analysis