diff --git a/keyboards/handwired/ep40/ep40.c b/keyboards/ep/40/40.c
similarity index 98%
rename from keyboards/handwired/ep40/ep40.c
rename to keyboards/ep/40/40.c
index 257f9fa80..7c235f3ce 100644
--- a/keyboards/handwired/ep40/ep40.c
+++ b/keyboards/ep/40/40.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "ep40.h"
+#include "40.h"
 
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
diff --git a/keyboards/handwired/ep40/ep40.h b/keyboards/ep/40/40.h
similarity index 100%
rename from keyboards/handwired/ep40/ep40.h
rename to keyboards/ep/40/40.h
diff --git a/keyboards/handwired/ep40/config.h b/keyboards/ep/40/config.h
similarity index 100%
rename from keyboards/handwired/ep40/config.h
rename to keyboards/ep/40/config.h
diff --git a/keyboards/handwired/ep40/info.json b/keyboards/ep/40/info.json
similarity index 100%
rename from keyboards/handwired/ep40/info.json
rename to keyboards/ep/40/info.json
diff --git a/keyboards/handwired/ep40/keymaps/default/keymap.c b/keyboards/ep/40/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/ep40/keymaps/default/keymap.c
rename to keyboards/ep/40/keymaps/default/keymap.c
diff --git a/keyboards/handwired/ep40/keymaps/default/readme.md b/keyboards/ep/40/keymaps/default/readme.md
similarity index 100%
rename from keyboards/handwired/ep40/keymaps/default/readme.md
rename to keyboards/ep/40/keymaps/default/readme.md
diff --git a/keyboards/handwired/ep40/readme.md b/keyboards/ep/40/readme.md
similarity index 77%
rename from keyboards/handwired/ep40/readme.md
rename to keyboards/ep/40/readme.md
index 5acd8892d..647842bad 100644
--- a/keyboards/handwired/ep40/readme.md
+++ b/keyboards/ep/40/readme.md
@@ -4,12 +4,12 @@
 
 A simple 40% keyboard
 
-Keyboard Maintainer: [Elliot Powell](https://reddit.com/u/e11i0t23, https://github.com/e11i0t23)  
+Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23), [/u/e11i0t23 on reddit](https://reddit.com/u/e11i0t23)  
 Hardware Supported: EP40 PCB  
 Hardware Availability: None at the moment
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ep40:default
+    make ep/40:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/ep40/rules.mk b/keyboards/ep/40/rules.mk
similarity index 100%
rename from keyboards/handwired/ep40/rules.mk
rename to keyboards/ep/40/rules.mk