added mds classes and removed unused hibernate classes