diff --git a/src/CarpetOption.js b/src/Carpets/CarpetOption.js
similarity index 100%
rename from src/CarpetOption.js
rename to src/Carpets/CarpetOption.js
diff --git a/src/Carpets.js b/src/Carpets/Carpets.js
similarity index 100%
rename from src/Carpets.js
rename to src/Carpets/Carpets.js
diff --git a/src/PlotOptions.js b/src/Plots/PlotOptions.js
similarity index 100%
rename from src/PlotOptions.js
rename to src/Plots/PlotOptions.js
diff --git a/src/PlotUtils.js b/src/Plots/PlotUtils.js
similarity index 100%
rename from src/PlotUtils.js
rename to src/Plots/PlotUtils.js
diff --git a/src/Plots.js b/src/Plots/Plots.js
similarity index 100%
rename from src/Plots.js
rename to src/Plots/Plots.js
diff --git a/src/ResetAndSave.js b/src/Plots/ResetAndSave.js
similarity index 100%
rename from src/ResetAndSave.js
rename to src/Plots/ResetAndSave.js
diff --git a/src/ToggleStyles.js b/src/Plots/ToggleStyles.js
similarity index 100%
rename from src/ToggleStyles.js
rename to src/Plots/ToggleStyles.js
diff --git a/src/ToggleSwitch.js b/src/Plots/ToggleSwitch.js
similarity index 100%
rename from src/ToggleSwitch.js
rename to src/Plots/ToggleSwitch.js
diff --git a/src/AboutPopUp.js b/src/PopUps/AboutPopUp.js
similarity index 100%
rename from src/AboutPopUp.js
rename to src/PopUps/AboutPopUp.js
diff --git a/src/IntroPopUp.js b/src/PopUps/IntroPopUp.js
similarity index 97%
rename from src/IntroPopUp.js
rename to src/PopUps/IntroPopUp.js
index 6724eba..c7fe86a 100644
--- a/src/IntroPopUp.js
+++ b/src/PopUps/IntroPopUp.js
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import UploadFolder from "./UploadFolder";
+import UploadFolder from "../UploadFolder";
 
 class IntroPopup extends Component {
   render() {
diff --git a/src/Panel.js b/src/Tabs/Panel.js
similarity index 100%
rename from src/Panel.js
rename to src/Tabs/Panel.js
diff --git a/src/Tabs.js b/src/Tabs/Tabs.js
similarity index 100%
rename from src/Tabs.js
rename to src/Tabs/Tabs.js
diff --git a/src/index.js b/src/index.js
index 13537d6..79b270c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,12 +1,12 @@
 import ReactDOM from "react-dom";
 import React, { Component } from "react";
 
-import Tabs from "./Tabs";
-import Panel from "./Panel";
-import Carpets from "./Carpets";
-import Plots from "./Plots";
-import IntroPopup from "./IntroPopUp";
-import AboutPopup from "./AboutPopUp";
+import Tabs from "./Tabs/Tabs";
+import Panel from "./Tabs/Panel";
+import Carpets from "./Carpets/Carpets";
+import Plots from "./Plots/Plots";
+import IntroPopup from "./PopUps/IntroPopUp";
+import AboutPopup from "./PopUps/AboutPopUp";
 
 import "./styles.css";