Many changes

Migrated queries file to another directory - project requirements. Also
removed some of the routing - we had duplicates.