Move and fix update enterprise code