Started refactoring classes