Rename data field to contents.
Super refactorings of Upload sytem.