diff --git a/README.md b/README.md
index ccc69cd..e95413c 100644
--- a/README.md
+++ b/README.md
@@ -32,13 +32,13 @@ Required:
   * A USB A Add-on Board if you want to plug your Pi into your Tesla like a USB drive instead of using a cable. [Amazon](https://www.amazon.com/gp/product/B07BK2BR6C/)
 
 Optional:
-* A case. Don't want unprotected circuits hanging about! Official case at [Adafruit](https://www.adafruit.com/product/2885) or [Amazon](https://www.amazon.com/gp/product/B06Y593MHV). There are many others to choose from. Note that the official case won't work with the USB A Add on board.
+* A case. The "Official" case: [Adafruit](https://www.adafruit.com/product/2885) or [Amazon](https://www.amazon.com/gp/product/B06Y593MHV). There are many others to choose from. Note that the official case won't work with the USB A Add on board.
 * USB Splitter if you don't want to lose a front USB port. [The Onvian Splitter](https://www.amazon.com/gp/product/B01KX4TKH6) has been reported working by multiple people on reddit.
 
 ### Software
-Download [Raspbian Stretch Lite](https://www.raspberrypi.org/downloads/raspbian/)
-Download and install:
-* [Etcher](http://etcher.io)
+Download: [Raspbian Stretch Lite](https://www.raspberrypi.org/downloads/raspbian/)
+
+Download and install: [Etcher](http://etcher.io)
  
 ## Set up the Raspberry Pi
 There are four phases to setting up the Pi:
@@ -47,6 +47,10 @@ There are four phases to setting up the Pi:
 1. Set up the archive for dashcam clips.
 1. Set up the USB storage functionality.
 
+There is a streamlined process for setting up the Pi which can currently be used if you plan to use Windows file shares, MacOS Sharing, or Samba on Linux for your video archive. [Instructions](doc/OneStepSetup.md).
+
+If you'd like to host the archive using another technology or would like to set the Pi up, yourself, continue these instructions. 
+
 ### Get the OS onto the MicroSD card
 [These instructions](https://www.raspberrypi.org/documentation/installation/installing-images/README.md) tell you how to get Raspbian onto your MicroSD card. Basically:
 1. Connect your SD card to your computer.
diff --git a/setup/headless_setup/Readme.md b/doc/OneStepSetup.md
similarity index 96%
rename from setup/headless_setup/Readme.md
rename to doc/OneStepSetup.md
index 097981b..38898ce 100644
--- a/setup/headless_setup/Readme.md
+++ b/doc/OneStepSetup.md
@@ -1,7 +1,6 @@
-# Flashable image to get started more quickly
-
-# This is a WORK IN PROGRESS, SHOULD CURRENTLY BE WORKING. 
+# One-step setup
 
+This is a streamlined process for setting up the Pi. You'll flash a preconfigured version of Raspbian Stretch Lite and then fill out a config file. 
 
 ## Notes 
 
@@ -97,8 +96,6 @@ At this point the next boot should start the Dashcam/music drives like normal. I
 
 For now the image creation work is at:
 * Modified pi-gen [rtgoodwin's fork of pi-gen](https://github.com/rtgoodwin/pi-gen) in (whatever current branch I'm working at the time). 
-* `headless-patch` branch of rtgoodwin fork [https://github.com/rtgoodwin/teslausb/tree/headless-patch/headless-scripts](https://github.com/rtgoodwin/teslausb/tree/headless-patch/headless-scripts)
-
 
 ### Image refinement TODOs
 1. ~~Patch the hostname to teslausb~~
diff --git a/setup/headless_setup/teslausb_setup_variables.conf.sample b/doc/teslausb_setup_variables.conf.sample
similarity index 100%
rename from setup/headless_setup/teslausb_setup_variables.conf.sample
rename to doc/teslausb_setup_variables.conf.sample