Split bson and json into package files and added builder.
Persistence tidying
Added utility packages
Added query packages