diff --git a/cast/src/receiver/layout/hc-lovelace.ts b/cast/src/receiver/layout/hc-lovelace.ts
index 3c52475fd6..fd5513eb81 100644
--- a/cast/src/receiver/layout/hc-lovelace.ts
+++ b/cast/src/receiver/layout/hc-lovelace.ts
@@ -8,7 +8,7 @@ import {
   property,
 } from "lit-element";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
-import "../../../../src/panels/lovelace/hui-view";
+import "../../../../src/panels/lovelace/views/hui-view";
 import { HomeAssistant } from "../../../../src/types";
 import { Lovelace } from "../../../../src/panels/lovelace/types";
 import "./hc-launch-screen";
diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts
index 13ab3dbb79..9f57cd25a8 100644
--- a/src/panels/lovelace/hui-root.ts
+++ b/src/panels/lovelace/hui-root.ts
@@ -35,13 +35,13 @@ import { navigate } from "../../common/navigate";
 import { fireEvent } from "../../common/dom/fire_event";
 import { swapView } from "./editor/config-util";
 
-import "./hui-view";
+import "./views/hui-view";
 // Not a duplicate import, this one is for type
 // tslint:disable-next-line
-import { HUIView } from "./hui-view";
-import "./hui-panel-view";
+import { HUIView } from "./views/hui-view";
+import "./views/hui-panel-view";
 // tslint:disable-next-line
-import { HUIPanelView } from "./hui-panel-view";
+import { HUIPanelView } from "./views/hui-panel-view";
 import { showEditViewDialog } from "./editor/view-editor/show-edit-view-dialog";
 import { showEditLovelaceDialog } from "./editor/lovelace-editor/show-edit-lovelace-dialog";
 import { Lovelace } from "./types";
diff --git a/src/panels/lovelace/hui-view-editable.ts b/src/panels/lovelace/hui-view-editable.ts
deleted file mode 100644
index 676b70ab17..0000000000
--- a/src/panels/lovelace/hui-view-editable.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// hui-view dependencies for when in edit mode.
-import "./components/hui-card-options";
-import "../../components/ha-fab";
diff --git a/src/panels/lovelace/hui-panel-view.ts b/src/panels/lovelace/views/hui-panel-view.ts
similarity index 78%
rename from src/panels/lovelace/hui-panel-view.ts
rename to src/panels/lovelace/views/hui-panel-view.ts
index dfdcf5d1ce..525465c05f 100644
--- a/src/panels/lovelace/hui-panel-view.ts
+++ b/src/panels/lovelace/views/hui-panel-view.ts
@@ -5,12 +5,12 @@ import {
   UpdatingElement,
 } from "lit-element";
 
-import applyThemesOnElement from "../../common/dom/apply_themes_on_element";
+import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 
-import { HomeAssistant } from "../../types";
-import { LovelaceCard } from "./types";
-import { createCardElement } from "./common/create-card-element";
-import { LovelaceViewConfig } from "../../data/lovelace";
+import { HomeAssistant } from "../../../types";
+import { LovelaceCard } from "../types";
+import { createCardElement } from "../common/create-card-element";
+import { LovelaceViewConfig } from "../../../data/lovelace";
 
 @customElement("hui-panel-view")
 export class HUIPanelView extends UpdatingElement {
@@ -22,8 +22,8 @@ export class HUIPanelView extends UpdatingElement {
     this.style.setProperty("background", "var(--lovelace-background)");
   }
 
-  protected updated(changedProperties: PropertyValues): void {
-    super.updated(changedProperties);
+  protected update(changedProperties: PropertyValues): void {
+    super.update(changedProperties);
 
     const hass = this.hass!;
     const hassChanged = changedProperties.has("hass");
diff --git a/src/panels/lovelace/views/hui-view-editable.ts b/src/panels/lovelace/views/hui-view-editable.ts
new file mode 100644
index 0000000000..4ef6e29420
--- /dev/null
+++ b/src/panels/lovelace/views/hui-view-editable.ts
@@ -0,0 +1,3 @@
+// hui-view dependencies for when in edit mode.
+import "../components/hui-card-options";
+import "../../../components/ha-fab";
diff --git a/src/panels/lovelace/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
similarity index 91%
rename from src/panels/lovelace/hui-view.ts
rename to src/panels/lovelace/views/hui-view.ts
index 8d78e0e84a..5edef27a25 100644
--- a/src/panels/lovelace/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -6,24 +6,24 @@ import {
   TemplateResult,
 } from "lit-element";
 
-import "../../components/entity/ha-state-label-badge";
+import "../../../components/entity/ha-state-label-badge";
 // This one is for types
 // tslint:disable-next-line
-import { HaStateLabelBadge } from "../../components/entity/ha-state-label-badge";
+import { HaStateLabelBadge } from "../../../components/entity/ha-state-label-badge";
 
-import applyThemesOnElement from "../../common/dom/apply_themes_on_element";
+import applyThemesOnElement from "../../../common/dom/apply_themes_on_element";
 
-import { LovelaceViewConfig, LovelaceCardConfig } from "../../data/lovelace";
-import { HomeAssistant } from "../../types";
+import { LovelaceViewConfig, LovelaceCardConfig } from "../../../data/lovelace";
+import { HomeAssistant } from "../../../types";
 import { classMap } from "lit-html/directives/class-map";
-import { Lovelace, LovelaceCard } from "./types";
-import { createCardElement } from "./common/create-card-element";
-import { computeCardSize } from "./common/compute-card-size";
-import { showEditCardDialog } from "./editor/card-editor/show-edit-card-dialog";
-import { HuiErrorCard } from "./cards/hui-error-card";
+import { Lovelace, LovelaceCard } from "../types";
+import { createCardElement } from "../common/create-card-element";
+import { computeCardSize } from "../common/compute-card-size";
+import { showEditCardDialog } from "../editor/card-editor/show-edit-card-dialog";
+import { HuiErrorCard } from "../cards/hui-error-card";
 
-import { computeRTL } from "../../common/util/compute_rtl";
-import { processConfigEntities } from "./common/process-config-entities";
+import { computeRTL } from "../../../common/util/compute_rtl";
+import { processConfigEntities } from "../common/process-config-entities";
 
 let editCodeLoaded = false;