Moved some files around and updated test case.