Refactoring classes into different files

Refactoring classes into different files
Merge pull request #1 from cusmonaut/Refactoring

Refactoring classes into different files