Removed docs; rearranged both classes and amended tests to meet those changes.