Updated Copyright/License
Merge branch 'master' into develop
Refactored file and class names for continuity and naming norms.
Small correction to README.