Major cleanup of files
More file cleanup