TEPHRA-8 Cleanup class and package names
Merge pull request #18 from continuuity/feature/code-cleanups

TEPHRA-8 Cleanup class and package names