Remove separate object for Collection types

[GladeDiviney]

AttributeCollection types like CoverFront internally define an object called Types. But this:

• Increases JAR size
• Isn't necessary because there's already a companion object
• Conflicts with the main Types object when auto-completing

So let's move these over to the existing Companion object in all cases.