Changed to sane directory structure
Can query users now