Moved some files, added more stubs for test cases.