Refactor organisation of classes