diff --git a/firmware/controllers/trigger/trigger_chrysler.h b/firmware/controllers/trigger/decoders/trigger_chrysler.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_chrysler.h
rename to firmware/controllers/trigger/decoders/trigger_chrysler.h
diff --git a/firmware/controllers/trigger/trigger_gm.h b/firmware/controllers/trigger/decoders/trigger_gm.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_gm.h
rename to firmware/controllers/trigger/decoders/trigger_gm.h
diff --git a/firmware/controllers/trigger/trigger_honda.h b/firmware/controllers/trigger/decoders/trigger_honda.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_honda.h
rename to firmware/controllers/trigger/decoders/trigger_honda.h
diff --git a/firmware/controllers/trigger/trigger_mazda.h b/firmware/controllers/trigger/decoders/trigger_mazda.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_mazda.h
rename to firmware/controllers/trigger/decoders/trigger_mazda.h
diff --git a/firmware/controllers/trigger/trigger_mitsubishi.h b/firmware/controllers/trigger/decoders/trigger_mitsubishi.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_mitsubishi.h
rename to firmware/controllers/trigger/decoders/trigger_mitsubishi.h
diff --git a/firmware/controllers/trigger/trigger_nissan.h b/firmware/controllers/trigger/decoders/trigger_nissan.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_nissan.h
rename to firmware/controllers/trigger/decoders/trigger_nissan.h
diff --git a/firmware/controllers/trigger/trigger_rover.h b/firmware/controllers/trigger/decoders/trigger_rover.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_rover.h
rename to firmware/controllers/trigger/decoders/trigger_rover.h
diff --git a/firmware/controllers/trigger/trigger_subaru.h b/firmware/controllers/trigger/decoders/trigger_subaru.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_subaru.h
rename to firmware/controllers/trigger/decoders/trigger_subaru.h
diff --git a/firmware/controllers/trigger/trigger_toyota.h b/firmware/controllers/trigger/decoders/trigger_toyota.h
similarity index 100%
rename from firmware/controllers/trigger/trigger_toyota.h
rename to firmware/controllers/trigger/decoders/trigger_toyota.h