diff --git a/benchtop-fe/src/components/CustomerForm.vue b/benchtop-fe/src/components/Customer/CustomerForm.vue
similarity index 100%
rename from benchtop-fe/src/components/CustomerForm.vue
rename to benchtop-fe/src/components/Customer/CustomerForm.vue
diff --git a/benchtop-fe/src/components/EnvironmentForm.vue b/benchtop-fe/src/components/Environment/EnvironmentForm.vue
similarity index 100%
rename from benchtop-fe/src/components/EnvironmentForm.vue
rename to benchtop-fe/src/components/Environment/EnvironmentForm.vue
diff --git a/benchtop-fe/src/components/PDF/PDF.vue b/benchtop-fe/src/components/PDF/PDF.vue
index cb68753..5a1c184 100644
--- a/benchtop-fe/src/components/PDF/PDF.vue
+++ b/benchtop-fe/src/components/PDF/PDF.vue
@@ -117,7 +117,6 @@
       </div>
     </div>
     <div>
-      {{ output() }}
     </div>
   </div>
 </template>
diff --git a/benchtop-fe/src/components/Sheet.vue b/benchtop-fe/src/components/Sheet.vue
index f65bc99..1dc0447 100644
--- a/benchtop-fe/src/components/Sheet.vue
+++ b/benchtop-fe/src/components/Sheet.vue
@@ -52,13 +52,13 @@
 <script setup>
 import { ref, defineEmits } from "vue";
 
-import CustomerForm from "./CustomerForm.vue";
+import CustomerForm from "./Customer/CustomerForm.vue";
 import NewInstrumentForm from "./Instrument/NewInstrumentForm.vue";
 import InstrumentForm from "./Instrument/InstrumentForm.vue";
 import NewCalibrationDeviceForm from "./CalibrationDevice/NewCalibrationDeviceForm.vue";
 import CalibrationDeviceForm from "./CalibrationDevice/CalibrationDeviceForm.vue";
-import EnvironmentForm from "./EnvironmentForm.vue";
-import UploadForm from "./UploadForm.vue";
+import EnvironmentForm from "./Environment/EnvironmentForm.vue";
+import UploadForm from "./Upload/UploadForm.vue";
 import PDF from "./PDF/PDF.vue";
 
 // Not needed yet
diff --git a/benchtop-fe/src/components/UploadForm.vue b/benchtop-fe/src/components/Upload/UploadForm.vue
similarity index 100%
rename from benchtop-fe/src/components/UploadForm.vue
rename to benchtop-fe/src/components/Upload/UploadForm.vue
diff --git a/benchtop-fe/src/main.js b/benchtop-fe/src/main.js
index 48c00e1..61ddabf 100644
--- a/benchtop-fe/src/main.js
+++ b/benchtop-fe/src/main.js
@@ -1,8 +1,8 @@
 import { createApp } from 'vue'
-import './reset.css'
-import './buttons.css'
-import './radio.css'
-import './style.css'
+import './styles/reset.css'
+import './styles/buttons.css'
+import './styles/radio.css'
+import './styles/style.css'
 import App from './App.vue'
 
 const app = createApp(App).mount('#app')
diff --git a/benchtop-fe/src/buttons.css b/benchtop-fe/src/styles/buttons.css
similarity index 100%
rename from benchtop-fe/src/buttons.css
rename to benchtop-fe/src/styles/buttons.css
diff --git a/benchtop-fe/src/radio.css b/benchtop-fe/src/styles/radio.css
similarity index 100%
rename from benchtop-fe/src/radio.css
rename to benchtop-fe/src/styles/radio.css
diff --git a/benchtop-fe/src/reset.css b/benchtop-fe/src/styles/reset.css
similarity index 100%
rename from benchtop-fe/src/reset.css
rename to benchtop-fe/src/styles/reset.css
diff --git a/benchtop-fe/src/style.css b/benchtop-fe/src/styles/style.css
similarity index 100%
rename from benchtop-fe/src/style.css
rename to benchtop-fe/src/styles/style.css