Move some files  around
Update filenames