Merge pull request #10 from AndreiLazarescu/refactoring_splitClasses

Refactoring split classes