Moved some stuff around and put queries into their own module, filters will exist in another