Removed an unused file and renamed another one to keep it in line with our naming conventions.