Renaming and deleting certain files.

Deleted unneeded files, And renamed some files