It probably makes sense to move the *Modifier and *Container base classes to the kernel as they are pretty stable and will, hopefully, be used by various modules. Thoughts?