Removed file with contents moved elsewhere.
Continue new naming convention.
Renamed for better naming conventions.