Separation of classes into files
Merge pull request #2 from patslat/master

made files only very small