OOP architecture refactoring started