File renaming, import cleanup