diff --git a/packages/grafana-schema/src/schema/graph.cue b/packages/grafana-schema/src/schema/graph.cue
index 32068654b77..bb95d8bc8a4 100644
--- a/packages/grafana-schema/src/schema/graph.cue
+++ b/packages/grafana-schema/src/schema/graph.cue
@@ -1,3 +1,5 @@
+package schema
+
 AxisPlacement:        "auto" | "top" | "right" | "bottom" | "left" | "hidden" @cuetsy(targetType="enum")
 PointVisibility:      "auto" | "never" | "always"                             @cuetsy(targetType="enum")
 DrawStyle:            "line" | "bars" | "points"                              @cuetsy(targetType="enum")
diff --git a/packages/grafana-schema/src/schema/mudball.cue b/packages/grafana-schema/src/schema/mudball.cue
deleted file mode 100644
index 6a01b01517a..00000000000
--- a/packages/grafana-schema/src/schema/mudball.cue
+++ /dev/null
@@ -1,161 +0,0 @@
-package schema
-
-// Use this file as a big TODO list - if it's still in here, it's a TODO to
-// separate it out into a discrete file.
-
-// FIXME can't write enums as structs, must use disjunctions
-TableCellDisplayMode: {
-	Auto: "auto",
-	ColorText: "color-text",
-	ColorBackground: "color-background",
-	GradientGauge: "gradient-gauge",
-	LcdGauge: "lcd-gauge",
-	JSONView: "json-view",
-	BasicGauge: "basic",
-	Image: "image",
-} @cuetsy(targetType="enum")
-
-TableFieldOptions: {
-	width?: number
-	align: FieldTextAlignment | *"auto"
-	displayMode: TableCellDisplayMode | *"auto"
-	hidden?: bool  // ?? default is missing or false ??
-} @cuetsy(targetType="interface")
-
-TableSortByFieldState: {
-  displayName: string
-  desc?: bool
-} @cuetsy(targetType="interface")
-
-FieldTextAlignment:   "auto" | "left" | "right" | "center" @cuetsy(targetType="type")
-AxisPlacement:        "auto" | "top" | "right" | "bottom" | "left" | "hidden" @cuetsy(targetType="enum")
-PointVisibility:      "auto" | "never" | "always"                             @cuetsy(targetType="enum")
-DrawStyle:            "line" | "bars" | "points"                              @cuetsy(targetType="enum")
-LineInterpolation:    "linear" | "smooth" | "stepBefore" | "stepAfter"        @cuetsy(targetType="enum")
-ScaleDistribution:    "linear" | "log"                                        @cuetsy(targetType="enum")
-GraphGradientMode:    "none" | "opacity" | "hue" | "scheme"                   @cuetsy(targetType="enum")
-StackingMode: "none" | "normal" | "percent" @cuetsy(targetType="enum")
-BarValueVisibility: "auto" | "never" | "always" @cuetsy(targetType="enum")
-BarAlignment: -1 | 0 | 1 @cuetsy(targetType="enum",memberNames="Before|Center|After")
-ScaleOrientation: 0 | 1 @cuetsy(targetType="enum",memberNames="Horizontal|Vertical")
-ScaleDirection: 1 | 1 | -1 | -1 @cuetsy(targetType="enum",memberNames="Up|Right|Down|Left")
-LineStyle: {
-	fill?: "solid" | "dash" | "dot" | "square"
-	dash?: [...number]
-} @cuetsy(targetType="interface")
-LineConfig: {
-	lineColor?:         string
-	lineWidth?:         number
-	lineInterpolation?: LineInterpolation
-	lineStyle?:         LineStyle
-	spanNulls?:         bool | number
-} @cuetsy(targetType="interface")
-BarConfig: {
-	barAlignment?: BarAlignment
-	barWidthFactor?: number
-	barMaxWidth?: number
-} @cuetsy(targetType="interface")
-FillConfig: {
-	fillColor?:   string
-	fillOpacity?: number
-	fillBelowTo?: string
-} @cuetsy(targetType="interface")
-PointsConfig: {
-	showPoints?:  PointVisibility
-	pointSize?:   number
-	pointColor?:  string
-	pointSymbol?: string
-} @cuetsy(targetType="interface")
-ScaleDistributionConfig: {
-	type: ScaleDistribution
-	log?: number
-} @cuetsy(targetType="interface")
-AxisConfig: {
-	axisPlacement?:     AxisPlacement
-	axisLabel?:         string
-	axisWidth?:         number
-	axisSoftMin?:       number
-	axisSoftMax?:       number
-	scaleDistribution?: ScaleDistributionConfig
-} @cuetsy(targetType="interface")
-HideSeriesConfig: {
-	tooltip: bool
-	legend:  bool
-	viz:   bool
-} @cuetsy(targetType="interface")
-StackingConfig: {
-  mode?: StackingMode
-  group?: string
-} @cuetsy(targetType="interface")
-StackableFieldConfig: {
-  stacking?: StackingConfig
-} @cuetsy(targetType="interface")
-HideableFieldConfig: {
-  hideFrom?: HideSeriesConfig
-} @cuetsy(targetType="interface")
-GraphTresholdsStyleMode: "off" | "line" | "area" | "line+area" | "series" @cuetsy(targetType="enum",memberNames="Off|Line|Area|LineAndArea|Series")
-GraphThresholdsStyleConfig: {
-  mode: GraphTresholdsStyleMode
-} @cuetsy(targetType="interface")
-TableFieldOptions: {
-	width?:      number
-	align:       FieldTextAlignment | *"auto"
-	displayMode: TableCellDisplayMode | *"auto"
-	hidden?:     bool
-} @cuetsy(targetType="interface")
-GraphFieldConfig: {
-  LineConfig
-  FillConfig
-  PointsConfig
-  AxisConfig
-  BarConfig
-  StackableFieldConfig
-  HideableFieldConfig
-  drawStyle?: DrawStyle
-  gradientMode?: GraphGradientMode
-  thresholdsStyle?: GraphThresholdsStyleConfig
-} @cuetsy(targetType="interface")
-// TODO copy back to appropriate place
-SingleStatBaseOptions: {
-	OptionsWithTextFormatting
-	reduceOptions: ReduceDataOptions
-	orientation: VizOrientation
-} @cuetsy(targetType="interface")
-// TODO copy back to appropriate place
-ReduceDataOptions: {
-	// If true show each row value
-	values?: bool
-	// if showing all values limit
-	limit?: number
-	// When !values, pick one value for the whole field
-	calcs: [...string]
-	// Which fields to show.  By default this is only numeric fields
-	fields?: string
-} @cuetsy(targetType="interface")
-// TODO copy back to appropriate place
-VizOrientation: "auto" | "vertical" | "horizontal" @cuetsy(targetType="enum")
-// TODO copy back to appropriate place
-OptionsWithTooltip: {
-	// FIXME this field is non-optional in the corresponding TS type
-	tooltip?: VizTooltipOptions
-} @cuetsy(targetType="interface")
-// TODO copy back to appropriate place
-OptionsWithLegend: {
-	// FIXME this field is non-optional in the corresponding TS type
-	legend?: VizLegendOptions
-} @cuetsy(targetType="interface")
-// TODO copy back to appropriate place
-OptionsWithTextFormatting: {
-	text?: VizTextDisplayOptions
-} @cuetsy(targetType="interface")
-// TODO copy back to appropriate place
-BigValueColorMode: "value" | "background" | "none" @cuetsy(targetType="enum")
-// TODO copy back to appropriate place
-BigValueGraphMode: "none" | "line" | "area" @cuetsy(targetType="enum")
-// TODO copy back to appropriate place
-BigValueJustifyMode: "auto" | "center" @cuetsy(targetType="enum")
-// TODO copy back to appropriate place
-// TODO does cuetsy handle underscores the expected way?
-BigValueTextMode: "auto" | "value" | "value_and_name" | "name" | "none"  @cuetsy(targetType="enum")
-// TODO copy back to appropriate place
-BarGaugeDisplayMode: "basic" | "lcd" | "gradient" @cuetsy(targetType="enum") 
\ No newline at end of file
diff --git a/packages/grafana-schema/src/schema/table.cue b/packages/grafana-schema/src/schema/table.cue
index c5f37cfd38d..25a46d056cb 100644
--- a/packages/grafana-schema/src/schema/table.cue
+++ b/packages/grafana-schema/src/schema/table.cue
@@ -1,6 +1,9 @@
+package schema
+
 // TODO -- should not be table specific!
 FieldTextAlignment: "auto" | "left" | "right" | "center" @cuetsy(targetType="type")
 
+// FIXME can't write enums as structs, must use disjunctions
 TableCellDisplayMode: {
   Auto: "auto",
   ColorText: "color-text",