diff --git a/Common.inc b/Common.inc
index 247066b..2f93f03 100644
--- a/Common.inc
+++ b/Common.inc
@@ -42,95 +42,95 @@ ENDIF
 ;**** **** **** **** ****
 ; ESC selection statements
 IF ESCNO == A_
-$include (A.inc)	; Select pinout A
+$include (targets/A.inc)	; Select pinout A
 ENDIF
 
 IF ESCNO == B_
-$include (B.inc)	; Select pinout B
+$include (targets/B.inc)	; Select pinout B
 ENDIF
 
 IF ESCNO == C_
-$include (C.inc)	; Select pinout C
+$include (targets/C.inc)	; Select pinout C
 ENDIF
 
 IF ESCNO == D_
-$include (D.inc)	; Select pinout D
+$include (targets/D.inc)	; Select pinout D
 ENDIF
 
 IF ESCNO == E_
-$include (E.inc)	; Select pinout E
+$include (targets/E.inc)	; Select pinout E
 ENDIF
 
 IF ESCNO == F_
-$include (F.inc)	; Select pinout F
+$include (targets/F.inc)	; Select pinout F
 ENDIF
 
 IF ESCNO == G_
-$include (G.inc)	; Select pinout G
+$include (targets/G.inc)	; Select pinout G
 ENDIF
 
 IF ESCNO == H_
-$include (H.inc)	; Select pinout H
+$include (targets/H.inc)	; Select pinout H
 ENDIF
 
 IF ESCNO == I_
-$include (I.inc)	; Select pinout I
+$include (targets/I.inc)	; Select pinout I
 ENDIF
 
 IF ESCNO == J_
-$include (J.inc)	; Select pinout J
+$include (targets/J.inc)	; Select pinout J
 ENDIF
 
 IF ESCNO == K_
-$include (K.inc)	; Select pinout K
+$include (targets/K.inc)	; Select pinout K
 ENDIF
 
 IF ESCNO == L_
-$include (L.inc)	; Select pinout L
+$include (targets/L.inc)	; Select pinout L
 ENDIF
 
 IF ESCNO == M_
-$include (M.inc)	; Select pinout M
+$include (targets/M.inc)	; Select pinout M
 ENDIF
 
 IF ESCNO == N_
-$include (N.inc)	; Select pinout N
+$include (targets/N.inc)	; Select pinout N
 ENDIF
 
 IF ESCNO == O_
-$include (O.inc)	; Select pinout O
+$include (targets/O.inc)	; Select pinout O
 ENDIF
 
 IF ESCNO == P_
-$include (P.inc)	; Select pinout P
+$include (targets/P.inc)	; Select pinout P
 ENDIF
 
 IF ESCNO == Q_
-$include (Q.inc)	; Select pinout Q
+$include (targets/Q.inc)	; Select pinout Q
 ENDIF
 
 IF ESCNO == R_
-$include (R.inc)	; Select pinout R
+$include (targets/R.inc)	; Select pinout R
 ENDIF
 
 IF ESCNO == S_
-$include (S.inc)	; Select pinout S
+$include (targets/S.inc)	; Select pinout S
 ENDIF
 
 IF ESCNO == T_
-$include (T.inc)	; Select pinout T
+$include (targets/T.inc)	; Select pinout T
 ENDIF
 
 IF ESCNO == U_
-$include (U.inc)	; Select pinout U
+$include (targets/U.inc)	; Select pinout U
 ENDIF
 
 IF ESCNO == V_
-$include (V.inc)	; Select pinout V
+$include (targets/V.inc)	; Select pinout V
 ENDIF
 
 IF ESCNO == W_
-$include (W.inc)	; Select pinout W
+$include (targets/W.inc)	; Select pinout W
 ENDIF
 
 
diff --git a/A.inc b/targets/A.inc
similarity index 100%
rename from A.inc
rename to targets/A.inc
diff --git a/B.inc b/targets/B.inc
similarity index 100%
rename from B.inc
rename to targets/B.inc
diff --git a/C.inc b/targets/C.inc
similarity index 100%
rename from C.inc
rename to targets/C.inc
diff --git a/D.inc b/targets/D.inc
similarity index 100%
rename from D.inc
rename to targets/D.inc
diff --git a/E.inc b/targets/E.inc
similarity index 100%
rename from E.inc
rename to targets/E.inc
diff --git a/F.inc b/targets/F.inc
similarity index 100%
rename from F.inc
rename to targets/F.inc
diff --git a/G.inc b/targets/G.inc
similarity index 100%
rename from G.inc
rename to targets/G.inc
diff --git a/H.inc b/targets/H.inc
similarity index 100%
rename from H.inc
rename to targets/H.inc
diff --git a/I.inc b/targets/I.inc
similarity index 100%
rename from I.inc
rename to targets/I.inc
diff --git a/J.inc b/targets/J.inc
similarity index 100%
rename from J.inc
rename to targets/J.inc
diff --git a/K.inc b/targets/K.inc
similarity index 100%
rename from K.inc
rename to targets/K.inc
diff --git a/L.inc b/targets/L.inc
similarity index 100%
rename from L.inc
rename to targets/L.inc
diff --git a/M.inc b/targets/M.inc
similarity index 100%
rename from M.inc
rename to targets/M.inc
diff --git a/N.inc b/targets/N.inc
similarity index 100%
rename from N.inc
rename to targets/N.inc
diff --git a/O.inc b/targets/O.inc
similarity index 100%
rename from O.inc
rename to targets/O.inc
diff --git a/P.inc b/targets/P.inc
similarity index 100%
rename from P.inc
rename to targets/P.inc
diff --git a/Q.inc b/targets/Q.inc
similarity index 100%
rename from Q.inc
rename to targets/Q.inc
diff --git a/R.inc b/targets/R.inc
similarity index 100%
rename from R.inc
rename to targets/R.inc
diff --git a/S.inc b/targets/S.inc
similarity index 100%
rename from S.inc
rename to targets/S.inc
diff --git a/T.inc b/targets/T.inc
similarity index 100%
rename from T.inc
rename to targets/T.inc
diff --git a/U.inc b/targets/U.inc
similarity index 100%
rename from U.inc
rename to targets/U.inc
diff --git a/V.inc b/targets/V.inc
similarity index 100%
rename from V.inc
rename to targets/V.inc
diff --git a/W.inc b/targets/W.inc
similarity index 100%
rename from W.inc
rename to targets/W.inc