complete restructured rbm model
solving merge conflicts