diff --git a/src/README b/roxie/README
similarity index 100%
rename from src/README
rename to roxie/README
diff --git a/src/button_interrupt.cpp b/roxie/button_interrupt.cpp
similarity index 100%
rename from src/button_interrupt.cpp
rename to roxie/button_interrupt.cpp
diff --git a/include/button_interrupt.h b/roxie/button_interrupt.h
similarity index 100%
rename from include/button_interrupt.h
rename to roxie/button_interrupt.h
diff --git a/src/crc.cpp b/roxie/crc.cpp
similarity index 100%
rename from src/crc.cpp
rename to roxie/crc.cpp
diff --git a/include/crc.h b/roxie/crc.h
similarity index 100%
rename from include/crc.h
rename to roxie/crc.h
diff --git a/include/data.h b/roxie/data.h
similarity index 100%
rename from include/data.h
rename to roxie/data.h
diff --git a/src/eeprom_backup.cpp b/roxie/eeprom_backup.cpp
similarity index 100%
rename from src/eeprom_backup.cpp
rename to roxie/eeprom_backup.cpp
diff --git a/include/eeprom_backup.h b/roxie/eeprom_backup.h
similarity index 100%
rename from include/eeprom_backup.h
rename to roxie/eeprom_backup.h
diff --git a/src/ili9225_screen.cpp b/roxie/ili9225_screen.cpp
similarity index 100%
rename from src/ili9225_screen.cpp
rename to roxie/ili9225_screen.cpp
diff --git a/include/ili9225_screen.h b/roxie/ili9225_screen.h
similarity index 100%
rename from include/ili9225_screen.h
rename to roxie/ili9225_screen.h
diff --git a/src/roxie.ino b/roxie/roxie.ino
similarity index 100%
rename from src/roxie.ino
rename to roxie/roxie.ino
diff --git a/src/roxie_config.h b/roxie/roxie_config.h
similarity index 94%
rename from src/roxie_config.h
rename to roxie/roxie_config.h
index e7afa97..b542192 100644
--- a/src/roxie_config.h
+++ b/roxie/roxie_config.h
@@ -149,36 +149,17 @@
 
 #define LEN(X) (sizeof(X) / sizeof(X[0]))
 
-#ifdef ARDUINO_NANO_EVERY
+
 #define BUTTON_1_PIN A0
 #define BUTTON_2_PIN A1
 #define BUTTON_3_PIN A2
-#else
-#define BUTTON_1_PIN PB3
-#define BUTTON_2_PIN PB4
-#define BUTTON_3_PIN PB5
-#endif
-
-#ifndef ARDUINO_NANO_EVERY
-#define TFT_RS PA2 // REGISTER SELECT
-#define TFT_CS PA4 // CS
-#define TFT_RST PA0
-#define TFT_SDI PA7 // MOSI
-#define TFT_CLK PA5 // SCK
-#define TFT_LED 0
-#else
+
 
 #define TFT_RS 9 // REGISTER SELECT
-#ifdef ARDUINO_NANO_EVERY
 #define TFT_CS 8   // CS
 #define TFT_RST 10 // TODO: 12 does not work, check why
-#else
-#define TFT_CS 10 // CS
-#define TFT_RST 12
-#endif
 #define TFT_SDI 11 // MOSI
 #define TFT_CLK 13 // SCK
 #define TFT_LED 0
-#endif
 
 #endif //ROXIE_CONFIG_H
diff --git a/include/screen.h b/roxie/screen.h
similarity index 100%
rename from include/screen.h
rename to roxie/screen.h
diff --git a/src/screen_data.cpp b/roxie/screen_data.cpp
similarity index 100%
rename from src/screen_data.cpp
rename to roxie/screen_data.cpp
diff --git a/include/screen_data.h b/roxie/screen_data.h
similarity index 100%
rename from include/screen_data.h
rename to roxie/screen_data.h
diff --git a/src/ssd1306_screen.cpp_old b/roxie/ssd1306_screen.cpp_old
similarity index 100%
rename from src/ssd1306_screen.cpp_old
rename to roxie/ssd1306_screen.cpp_old
diff --git a/include/ssd1306_screen.h_old b/roxie/ssd1306_screen.h_old
similarity index 100%
rename from include/ssd1306_screen.h_old
rename to roxie/ssd1306_screen.h_old
diff --git a/src/tft_util.cpp b/roxie/tft_util.cpp
similarity index 100%
rename from src/tft_util.cpp
rename to roxie/tft_util.cpp
diff --git a/include/tft_util.h b/roxie/tft_util.h
similarity index 100%
rename from include/tft_util.h
rename to roxie/tft_util.h
diff --git a/src/util.cpp b/roxie/util.cpp
similarity index 100%
rename from src/util.cpp
rename to roxie/util.cpp
diff --git a/include/util.h b/roxie/util.h
similarity index 100%
rename from include/util.h
rename to roxie/util.h
diff --git a/src/vertical_screen.cpp b/roxie/vertical_screen.cpp
similarity index 100%
rename from src/vertical_screen.cpp
rename to roxie/vertical_screen.cpp
diff --git a/include/vertical_screen.h b/roxie/vertical_screen.h
similarity index 100%
rename from include/vertical_screen.h
rename to roxie/vertical_screen.h
diff --git a/src/vesc_comm.cpp b/roxie/vesc_comm.cpp
similarity index 100%
rename from src/vesc_comm.cpp
rename to roxie/vesc_comm.cpp
diff --git a/include/vesc_comm.h b/roxie/vesc_comm.h
similarity index 100%
rename from include/vesc_comm.h
rename to roxie/vesc_comm.h
diff --git a/src/vesc_comm_standard.cpp b/roxie/vesc_comm_standard.cpp
similarity index 100%
rename from src/vesc_comm_standard.cpp
rename to roxie/vesc_comm_standard.cpp
diff --git a/include/vesc_comm_standard.h b/roxie/vesc_comm_standard.h
similarity index 100%
rename from include/vesc_comm_standard.h
rename to roxie/vesc_comm_standard.h
diff --git a/src/vesc_comm_unity.cpp b/roxie/vesc_comm_unity.cpp
similarity index 100%
rename from src/vesc_comm_unity.cpp
rename to roxie/vesc_comm_unity.cpp
diff --git a/include/vesc_comm_unity.h b/roxie/vesc_comm_unity.h
similarity index 100%
rename from include/vesc_comm_unity.h
rename to roxie/vesc_comm_unity.h