Refactor file organization

* Separate classes into different files
* Some spelling mistakes
Merge pull request #13 from migl/refactor/renaming

Refactor file organization