Splitting of the classes were done.
Merge pull request #3 from TiaDalma/master

Splitting of the classes were done.