Refactor of project to include test packages and changes to some class
names.