Move part of functional to another class