Cleaned up headers

Changed headers from file names.