Restructured the core and isolated the VNH Assignment functionality