Deleted some files that are no longer needed. renamed others