more file clean up, renaming