Move some files and new tests.