Storing of uploaded files, refactored keyspaces