moved xq to map, update accordingly
bumped version, removed old test app
removed backwards-compat stuff