Move storage and sources into own user relations