diff --git a/protocols/oregon2.txt b/protocols/oregon2.txt
deleted file mode 100644
index 36263143114..00000000000
--- a/protocols/oregon2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-11001100110011001100110011001100110011001100110011001100110 (Preamble)
-10 01 01 10 10 01 01 10 (Sync)
-01 10 10 01 10 01 10 01 01 10 10 01 01 10 01 10 10 01 01 10 10 01 10 01 10 01 10 01 10 01 10 01 01 10 10 01 10 01 10 01 01 10 01 10 01 10 01 10 01 10 01 10 10 01 01 10 01 10 10 01 10 01 10 01 10 01 10 01 01 10 10 01 10 01 01 10 01 10 10 01 01 10 10 01 10 01 10 01 10 01 10 01 10 01 11 0
-
-We need to seek the following bytes: 01100110 01100110 10010110 10010110
-                                        0x66     0x66     96       96
diff --git a/protocols/citroen_tpms.c b/protocols/tpms/citroen.c
similarity index 99%
rename from protocols/citroen_tpms.c
rename to protocols/tpms/citroen.c
index 4b80a3b28dd..992b7f4b0a8 100644
--- a/protocols/citroen_tpms.c
+++ b/protocols/tpms/citroen.c
@@ -5,7 +5,7 @@
  * Then Manchester bits, 10 bytes total.
  * Simple XOR checksum. */
 
-#include "../app.h"
+#include "../../app.h"
 
 static bool decode(uint8_t *bits, uint32_t numbytes, uint32_t numbits, ProtoViewMsgInfo *info) {
 
diff --git a/protocols/ford_tpms.c b/protocols/tpms/ford.c
similarity index 99%
rename from protocols/ford_tpms.c
rename to protocols/tpms/ford.c
index 2cab0ea91a2..a9c687075d0 100644
--- a/protocols/ford_tpms.c
+++ b/protocols/tpms/ford.c
@@ -8,7 +8,7 @@
  * 10 = one
  */
 
-#include "../app.h"
+#include "../../app.h"
 
 static bool decode(uint8_t *bits, uint32_t numbytes, uint32_t numbits, ProtoViewMsgInfo *info) {
 
diff --git a/protocols/renault_tpms.c b/protocols/tpms/renault.c
similarity index 99%
rename from protocols/renault_tpms.c
rename to protocols/tpms/renault.c
index 1f8ea0711b8..4bbe55e42a3 100644
--- a/protocols/renault_tpms.c
+++ b/protocols/tpms/renault.c
@@ -3,7 +3,7 @@
  * Preamble + sync + Manchester bits. ~48us short pulse.
  * 9 Bytes in total not counting the preamble. */
 
-#include "../app.h"
+#include "../../app.h"
 
 #define USE_TEST_VECTOR 0
 static const char *test_vector =
diff --git a/protocols/schrader_tpms.c b/protocols/tpms/schrader.c
similarity index 99%
rename from protocols/schrader_tpms.c
rename to protocols/tpms/schrader.c
index ebf3d600489..ab65a92d39f 100644
--- a/protocols/schrader_tpms.c
+++ b/protocols/tpms/schrader.c
@@ -8,7 +8,7 @@
  *
  * Used in FIAT-Chrysler, Mercedes, ... */
 
-#include "../app.h"
+#include "../../app.h"
 
 #define USE_TEST_VECTOR 0
 static const char *test_vector = "000000111101010101011010010110010110101001010110100110011001100101010101011010100110100110011010101010101010101010101010101010101010101010101010";
diff --git a/protocols/schrader_eg53ma4_tpms.c b/protocols/tpms/schrader_eg53ma4.c
similarity index 99%
rename from protocols/schrader_eg53ma4_tpms.c
rename to protocols/tpms/schrader_eg53ma4.c
index b82c40953f2..6fce40d64e2 100644
--- a/protocols/schrader_eg53ma4_tpms.c
+++ b/protocols/tpms/schrader_eg53ma4.c
@@ -13,7 +13,7 @@
  * Used in certain Open cars and others.
  */
 
-#include "../app.h"
+#include "../../app.h"
 
 static bool decode(uint8_t *bits, uint32_t numbytes, uint32_t numbits, ProtoViewMsgInfo *info) {
 
diff --git a/protocols/toyota_tpms.c b/protocols/tpms/toyota.c
similarity index 99%
rename from protocols/toyota_tpms.c
rename to protocols/tpms/toyota.c
index a626944a7bd..b2735373957 100644
--- a/protocols/toyota_tpms.c
+++ b/protocols/tpms/toyota.c
@@ -22,7 +22,7 @@
  * [0011111]01
  */
 
-#include "../app.h"
+#include "../../app.h"
 
 static bool decode(uint8_t *bits, uint32_t numbytes, uint32_t numbits, ProtoViewMsgInfo *info) {