Reorg nearly finished. Remaining: Fix JSON object references + User Status + Storing Queues