re-organize; change ml.shifu.shifu to ml.shifu.core