Refactoring classes into different files

Refactoring classes into different files