Moving classes and cleaning up.
tests cases.