Other cleanup and moved files.