TEMP: Smal refactoring - split classes