diff --git a/first-floor-lighting/dining-room/processing.js b/first-floor/dining-room/processing.js
similarity index 100%
rename from first-floor-lighting/dining-room/processing.js
rename to first-floor/dining-room/processing.js
diff --git a/first-floor-lighting/downstairs-bathroom/downstairs-bathroom.js b/first-floor/downstairs-bathroom/downstairs-bathroom.js
similarity index 100%
rename from first-floor-lighting/downstairs-bathroom/downstairs-bathroom.js
rename to first-floor/downstairs-bathroom/downstairs-bathroom.js
diff --git a/first-floor-lighting/living-room/processing.js b/first-floor/living-room/processing.js
similarity index 100%
rename from first-floor-lighting/living-room/processing.js
rename to first-floor/living-room/processing.js
diff --git a/first-floor-lighting/mud-room/mud-room.js b/first-floor/mud-room/mud-room.js
similarity index 100%
rename from first-floor-lighting/mud-room/mud-room.js
rename to first-floor/mud-room/mud-room.js
diff --git a/second-floor-lighting/emma-bedroom/emma-bedroom.js b/second-floor/emma-bedroom/emma-bedroom.js
similarity index 100%
rename from second-floor-lighting/emma-bedroom/emma-bedroom.js
rename to second-floor/emma-bedroom/emma-bedroom.js
diff --git a/second-floor-lighting/kallen-bedroom/kallen-bedroom.js b/second-floor/kallen-bedroom/kallen-bedroom.js
similarity index 100%
rename from second-floor-lighting/kallen-bedroom/kallen-bedroom.js
rename to second-floor/kallen-bedroom/kallen-bedroom.js
diff --git a/second-floor-lighting/master-bedroom/master-bedroom.js b/second-floor/master-bedroom/master-bedroom.js
similarity index 100%
rename from second-floor-lighting/master-bedroom/master-bedroom.js
rename to second-floor/master-bedroom/master-bedroom.js
diff --git a/second-floor-lighting/stairwell/adjust.js b/second-floor/stairwell/adjust.js
similarity index 100%
rename from second-floor-lighting/stairwell/adjust.js
rename to second-floor/stairwell/adjust.js
diff --git a/second-floor-lighting/stairwell/on-off.js b/second-floor/stairwell/on-off.js
similarity index 100%
rename from second-floor-lighting/stairwell/on-off.js
rename to second-floor/stairwell/on-off.js
diff --git a/second-floor-lighting/stairwell/timer-finished.js b/second-floor/stairwell/timer-finished.js
similarity index 100%
rename from second-floor-lighting/stairwell/timer-finished.js
rename to second-floor/stairwell/timer-finished.js
diff --git a/second-floor-lighting/upstairs-bathroom/auto-shower-mode.js b/second-floor/upstairs-bathroom/auto-shower-mode.js
similarity index 100%
rename from second-floor-lighting/upstairs-bathroom/auto-shower-mode.js
rename to second-floor/upstairs-bathroom/auto-shower-mode.js
diff --git a/second-floor-lighting/upstairs-bathroom/motion-detected.js b/second-floor/upstairs-bathroom/motion-detected.js
similarity index 100%
rename from second-floor-lighting/upstairs-bathroom/motion-detected.js
rename to second-floor/upstairs-bathroom/motion-detected.js
diff --git a/second-floor-lighting/upstairs-bathroom/shower-mode.js b/second-floor/upstairs-bathroom/shower-mode.js
similarity index 100%
rename from second-floor-lighting/upstairs-bathroom/shower-mode.js
rename to second-floor/upstairs-bathroom/shower-mode.js
diff --git a/second-floor-lighting/upstairs-bathroom/timer-finished.js b/second-floor/upstairs-bathroom/timer-finished.js
similarity index 100%
rename from second-floor-lighting/upstairs-bathroom/timer-finished.js
rename to second-floor/upstairs-bathroom/timer-finished.js