Code refactoring
Code refactoring
Removed some classes