diff --git a/src/App.tsx b/src/App.tsx
index d7fb4f4eb33853ed7abf6073a19f63678e85542d..d70a8737b4d80d575ec260b13eb76db02d9dc160 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,8 +4,8 @@ import ScreenWrapper from "./meta/ScreenWrapper";
 import useLayout from "./hooks/useLayout";
 import {PanelRenderers} from "./panels/_Panels";
 import LayoutElement from "./layout/LayoutElement";
-import ErrorPanel from "./panels/Error";
 import {ErrorBoundary} from "react-error-boundary";
+import ErrorPanel from "./panels/Error/ErrorPanel";
 
 function App() {
   const layout = useLayout();
diff --git a/src/panels/Bild.tsx b/src/panels/Bild/BildPanel.tsx
similarity index 91%
rename from src/panels/Bild.tsx
rename to src/panels/Bild/BildPanel.tsx
index f8db8b2ef4c266c381667cd2ea0df78ec67a541f..607eba5044bd97dd8070ff12d8bb28dd9c5ce8d5 100644
--- a/src/panels/Bild.tsx
+++ b/src/panels/Bild/BildPanel.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
-import PanelWrapper from "../meta/PanelWrapper";
-import classNames from "../util/classNames";
-import PanelContent from "../meta/PanelContent";
+import PanelWrapper from "../../meta/PanelWrapper";
+import classNames from "../../util/classNames";
+import PanelContent from "../../meta/PanelContent";
 
 export type BildPanelDefinition = {
   url: string,
diff --git a/src/panels/Error.tsx b/src/panels/Error/ErrorPanel.tsx
similarity index 85%
rename from src/panels/Error.tsx
rename to src/panels/Error/ErrorPanel.tsx
index f1a931e0309fda4242394e066059ee0e7f56f38d..bc0db9ccbf48f54af1e06dcea047b11411ebe018 100644
--- a/src/panels/Error.tsx
+++ b/src/panels/Error/ErrorPanel.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import PanelWrapper from "../meta/PanelWrapper";
+import PanelWrapper from "../../meta/PanelWrapper";
 
 const ErrorPanel = (props: {message?: string}) => {
   const message = props.message ?? "Failed to render Panel";
diff --git a/src/panels/Mensaplan.tsx b/src/panels/Mensaplan/MensaplanPanel.tsx
similarity index 57%
rename from src/panels/Mensaplan.tsx
rename to src/panels/Mensaplan/MensaplanPanel.tsx
index 5be7012c3666f73da17a0131ba13eacd0450d05a..af581a553fb9af302fc27faa572dd2e3ac5ca44d 100644
--- a/src/panels/Mensaplan.tsx
+++ b/src/panels/Mensaplan/MensaplanPanel.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const Mensaplan = () => {
+const MensaplanPanel = () => {
   return (
     <div>
       Mensaplan
@@ -8,4 +8,4 @@ const Mensaplan = () => {
   );
 };
 
-export default Mensaplan;
+export default MensaplanPanel;
diff --git a/src/panels/Uhr.tsx b/src/panels/Uhr/UhrPanel.tsx
similarity index 61%
rename from src/panels/Uhr.tsx
rename to src/panels/Uhr/UhrPanel.tsx
index 64b30babb1f273f1970e344e57d07d2782d459f6..6d306954d901a1651fa49790a964d52127acdb35 100644
--- a/src/panels/Uhr.tsx
+++ b/src/panels/Uhr/UhrPanel.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const Uhr = () => {
+const UhrPanel = () => {
   return (
     <div>
       Uhr
@@ -8,4 +8,4 @@ const Uhr = () => {
   );
 };
 
-export default Uhr;
+export default UhrPanel;
diff --git a/src/panels/_Panels.tsx b/src/panels/_Panels.tsx
index e030ce0e8f1f132cf314de5303a840442aedf58b..ec1208660e60185e73e60704e0bc832710533bf9 100644
--- a/src/panels/_Panels.tsx
+++ b/src/panels/_Panels.tsx
@@ -6,8 +6,8 @@
 import React from "react";
 import FahrplanPanel from "./Fahrplan/FahrplanPanel";
 import {PanelDefinition} from "../types/LayoutConfig";
-import BildPanel from "./Bild";
 import PanelWrapper from "../meta/PanelWrapper";
+import BildPanel from "./Bild/BildPanel";
 
 /*
  * First, please claim a unique id for your panel here. Convention is that it is all lowercase, in snake-case to be