strucure reorganized & trying to implement mongoDB