Refactor user and tweet storage so it is consistent on a per-user and per-tweet basis