bit of re-orging and adding mongodb drivers