Adding mongoose
Cleaning up the structure