Refactored bson directories.