Added classes and tests
Remove unused files
Merge branch 'master' into gradle