Move files around a lil; prevent namespace pollution in idb backend
Merge branch 'master' into gh-pages