Moved files to Classes folder
Merge branch 'release/0.1.3'