-import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.computeDefaultSUID;
-import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.encodeAngleBrackets;
-import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.packageNameForAugmentedGeneratedType;
-import static org.opendaylight.mdsal.binding.generator.util.BindingGeneratorUtil.packageNameForGeneratedType;
-import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.DATA_OBJECT;
-import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.DATA_ROOT;
-import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.IDENTIFIABLE;
-import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.IDENTIFIER;
-import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.NOTIFICATION;
-import static org.opendaylight.mdsal.binding.generator.util.BindingTypes.augmentable;
-import static org.opendaylight.mdsal.binding.generator.util.Types.BOOLEAN;
-import static org.opendaylight.mdsal.binding.generator.util.Types.FUTURE;
-import static org.opendaylight.mdsal.binding.generator.util.Types.VOID;
-import static org.opendaylight.mdsal.binding.generator.util.Types.typeForClass;
+import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.computeDefaultSUID;
+import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.encodeAngleBrackets;
+import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.packageNameForAugmentedGeneratedType;
+import static org.opendaylight.mdsal.binding.model.util.BindingGeneratorUtil.packageNameForGeneratedType;
+import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_OBJECT;
+import static org.opendaylight.mdsal.binding.model.util.BindingTypes.DATA_ROOT;
+import static org.opendaylight.mdsal.binding.model.util.BindingTypes.IDENTIFIABLE;
+import static org.opendaylight.mdsal.binding.model.util.BindingTypes.IDENTIFIER;
+import static org.opendaylight.mdsal.binding.model.util.BindingTypes.NOTIFICATION;
+import static org.opendaylight.mdsal.binding.model.util.BindingTypes.augmentable;
+import static org.opendaylight.mdsal.binding.model.util.Types.BOOLEAN;
+import static org.opendaylight.mdsal.binding.model.util.Types.FUTURE;
+import static org.opendaylight.mdsal.binding.model.util.Types.VOID;
+import static org.opendaylight.mdsal.binding.model.util.Types.typeForClass;