Renaming files, to follow best practices
Files and test classed renamed.
A couple more tests -- over 96% coverage.