Move files, remove test code