diff --git a/src/App.tsx b/src/App.tsx
deleted file mode 100644
index 921bb81..0000000
--- a/src/App.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import * as React from 'react';
-import './App.css';
-
-const logo = require('./logo.svg');
-
-class App extends React.Component {
-  render() {
-    return (
-      <div className="App">
-        <header className="App-header">
-          <img src={logo} className="App-logo" alt="logo" />
-          <h1 className="App-title">Welcome to React</h1>
-        </header>
-        <p className="App-intro">
-          To get started, edit <code>src/App.tsx</code> and save to reload.
-        </p>
-      </div>
-    );
-  }
-}
-
-export default App;
diff --git a/src/App.css b/src/Components/CreateEditorApp/CreateEditorApp.css
similarity index 100%
rename from src/App.css
rename to src/Components/CreateEditorApp/CreateEditorApp.css
diff --git a/src/App.test.tsx b/src/Components/CreateEditorApp/CreateEditorApp.test.tsx
similarity index 62%
rename from src/App.test.tsx
rename to src/Components/CreateEditorApp/CreateEditorApp.test.tsx
index 2b4da0b..f513a9b 100644
--- a/src/App.test.tsx
+++ b/src/Components/CreateEditorApp/CreateEditorApp.test.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import App from './App';
+import { CreateEditorApp } from './CreateEditorApp';
 
 it('renders without crashing', () => {
   const div = document.createElement('div');
-  ReactDOM.render(<App />, div);
+  ReactDOM.render(<CreateEditorApp />, div);
 });
diff --git a/src/Components/CreateEditorApp/CreateEditorApp.tsx b/src/Components/CreateEditorApp/CreateEditorApp.tsx
new file mode 100644
index 0000000..18b04f0
--- /dev/null
+++ b/src/Components/CreateEditorApp/CreateEditorApp.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import './CreateEditorApp.css';
+import { DraggableNode } from '../DraggableNode';
+
+const logo = require('./logo.svg');
+
+export class CreateEditorApp extends React.Component {
+  render() {
+    return (
+      <div className="App">
+        <DraggableNode>
+          <header className="App-header">
+            <img src={logo} className="App-logo" alt="logo" />
+            <h1 className="App-title">Welcome to React</h1>
+          </header>
+        </DraggableNode>
+        <p className="App-intro">
+          To get started, edit <code>src/App.tsx</code> and save to reload.
+        </p>
+      </div>
+    );
+  }
+}
\ No newline at end of file
diff --git a/src/Components/CreateEditorApp/index.tsx b/src/Components/CreateEditorApp/index.tsx
new file mode 100644
index 0000000..3f0d883
--- /dev/null
+++ b/src/Components/CreateEditorApp/index.tsx
@@ -0,0 +1 @@
+export { CreateEditorApp } from './CreateEditorApp';
\ No newline at end of file
diff --git a/src/logo.svg b/src/Components/CreateEditorApp/logo.svg
similarity index 100%
rename from src/logo.svg
rename to src/Components/CreateEditorApp/logo.svg
diff --git a/src/index.tsx b/src/index.tsx
index 1c66245..15fd4a1 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import App from './App';
+import { CreateEditorApp } from './Components/CreateEditorApp';
 import registerServiceWorker from './registerServiceWorker';
 import './index.css';
 
 ReactDOM.render(
-  <App />,
+  <CreateEditorApp />,
   document.getElementById('root') as HTMLElement
 );
 registerServiceWorker();