Fixing the active query queue, restructuring the protocol folder.