diff --git a/setup/macos-live/El Capitan/Utilities.plist b/setup/macos/El Capitan/Utilities.plist
similarity index 100%
rename from setup/macos-live/El Capitan/Utilities.plist
rename to setup/macos/El Capitan/Utilities.plist
diff --git a/setup/macos-live/El Capitan/com.googlecode.iterm2.plist b/setup/macos/El Capitan/com.googlecode.iterm2.plist
similarity index 100%
rename from setup/macos-live/El Capitan/com.googlecode.iterm2.plist
rename to setup/macos/El Capitan/com.googlecode.iterm2.plist
diff --git a/setup/macos-live/Utilities.plist b/setup/macos/Utilities.plist
similarity index 100%
rename from setup/macos-live/Utilities.plist
rename to setup/macos/Utilities.plist
diff --git a/setup/macos-live/aliases b/setup/macos/aliases
similarity index 100%
rename from setup/macos-live/aliases
rename to setup/macos/aliases
diff --git a/setup/macos-live/bashrc b/setup/macos/bashrc
similarity index 100%
rename from setup/macos-live/bashrc
rename to setup/macos/bashrc
diff --git a/setup/macos-live/com.googlecode.iterm2.plist b/setup/macos/com.googlecode.iterm2.plist
similarity index 100%
rename from setup/macos-live/com.googlecode.iterm2.plist
rename to setup/macos/com.googlecode.iterm2.plist
diff --git a/setup/macos-live/live-macos-startup b/setup/macos/live-macos-startup
similarity index 100%
rename from setup/macos-live/live-macos-startup
rename to setup/macos/live-macos-startup
diff --git a/setup/macos-live/update-base-image b/setup/macos/update-base-image
similarity index 100%
rename from setup/macos-live/update-base-image
rename to setup/macos/update-base-image
diff --git a/setup/macos-live/vimrc b/setup/macos/vimrc
similarity index 100%
rename from setup/macos-live/vimrc
rename to setup/macos/vimrc
diff --git a/setup/macos-live/zshrc b/setup/macos/zshrc
similarity index 100%
rename from setup/macos-live/zshrc
rename to setup/macos/zshrc