Some renames & duplicate file removals