Mostly name changes to improve readability of project but also started
new test suite.