add refactored classes