Issue #14: More refactoring to work with different versions of Mongoid and ActiveModel
Finally found the correct Gemfile incantation
Match folders to module names