Changed the mongoDB structure so something that makes more sense