Added classes and tests
Remove unused files