Move and rename most files to tidy up directory