Moved D/I internals to new core package

core/src/main/scala/chisel3/Module.scala

@@ -201,7 +201,7 @@ package experimental {
 
 package internal {
   import chisel3.experimental.BaseModule
-  import chisel3.experimental.hierarchy.{Clone, IsInstantiable, Proto}
+  import chisel3.experimental.hierarchy.core.{Clone, IsInstantiable, Proto}
 
   object BaseModule {
 
@@ -392,11 +392,11 @@ package internal {
 
 package experimental {
 
-  import chisel3.experimental.hierarchy.{IsInstantiable, Proto}
+  import chisel3.experimental.hierarchy.core.{IsInstantiable, Proto}
 
   object BaseModule {
     implicit class BaseModuleExtensions[T <: BaseModule](b: T) {
-      import chisel3.experimental.hierarchy.{Definition, Instance}
+      import chisel3.experimental.hierarchy.core.{Definition, Instance}
       def toInstance:   Instance[T] = new Instance(Proto(b))
       def toDefinition: Definition[T] = new Definition(Proto(b))
     }

core/src/main/scala/chisel3/experimental/hierarchy/LibraryHooks.scala

@@ -2,6 +2,7 @@
 
 package chisel3.experimental.hierarchy
 
+import chisel3.experimental.hierarchy.core.Underlying
 import scala.annotation.implicitNotFound
 
 @implicitNotFound("These functions are only for building hierarchy-compatible Chisel libraries! Users beware!")

core/src/main/scala/chisel3/experimental/hierarchy/Definition.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/Definition.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 import scala.language.experimental.macros
 import chisel3._

core/src/main/scala/chisel3/experimental/hierarchy/Hierarchy.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/Hierarchy.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 import chisel3._
 import scala.collection.mutable.{HashMap, HashSet}

core/src/main/scala/chisel3/experimental/hierarchy/Instance.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/Instance.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 import scala.collection.mutable.{ArrayBuffer, HashMap}
 import scala.language.experimental.macros

core/src/main/scala/chisel3/experimental/hierarchy/IsInstantiable.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/IsInstantiable.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 /** While this is public, it is not recommended for users to extend directly.
   * Instead, use the [[@instantiable]] annotation on your trait or class.

core/src/main/scala/chisel3/experimental/hierarchy/IsLookupable.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/IsLookupable.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 /** A User-extendable trait to mark metadata-containers, e.g. parameter case classes, as valid to return unchanged
   * from an instance.

core/src/main/scala/chisel3/experimental/hierarchy/Lookupable.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/Lookupable.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 import chisel3.experimental.BaseModule
 import chisel3.internal.sourceinfo.SourceInfo

core/src/main/scala/chisel3/experimental/hierarchy/Underlying.scala → core/src/main/scala/chisel3/experimental/hierarchy/core/Underlying.scala

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
-package chisel3.experimental.hierarchy
+package chisel3.experimental.hierarchy.core
 
 import chisel3.internal.BaseModule.IsClone
 

core/src/main/scala/chisel3/experimental/hierarchy/package.scala

@@ -45,4 +45,13 @@ package object hierarchy {
     * }}}
     */
   class public extends chisel3.internal.public
+
+  type Instance[P] = core.Instance[P]
+  val Instance = core.Instance
+  type Definition[P] = core.Definition[P]
+  val Definition = core.Definition
+  type Hierarchy[P] = core.Hierarchy[P]
+  val Hierarchy = core.Hierarchy
+  type IsInstantiable = core.IsInstantiable
+  type IsLookupable = core.IsLookupable
 }

core/src/main/scala/chisel3/internal/Builder.scala

@@ -6,7 +6,7 @@ import scala.util.DynamicVariable
 import scala.collection.mutable.ArrayBuffer
 import chisel3._
 import chisel3.experimental._
-import chisel3.experimental.hierarchy.{Clone, Instance}
+import chisel3.experimental.hierarchy.core.{Clone, Instance}
 import chisel3.internal.firrtl._
 import chisel3.internal.naming._
 import _root_.firrtl.annotations.{CircuitName, ComponentName, IsMember, ModuleName, Named, ReferenceTarget}

src/main/scala/chisel3/aop/Select.scala

@@ -7,7 +7,7 @@ import chisel3.internal.{HasId}
 import chisel3.experimental.BaseModule
 import chisel3.experimental.FixedPoint
 import chisel3.internal.firrtl.{Definition => DefinitionIR, _}
-import chisel3.experimental.hierarchy._
+import chisel3.experimental.hierarchy.core._
 import chisel3.internal.PseudoModule
 import chisel3.internal.BaseModule.ModuleClone
 import firrtl.annotations.ReferenceTarget