Renaming stuff.
Deleted old file.