Refactored mongo stuff out of metadata into mongo/metadata (not complete yet, have to finish crud for build to be successful)
Finished refactoring mongo stuff out to separate module.  Included moving 'test' module