diff --git a/Projects/AVRISP/Lib/ISPProtocol.c b/Projects/AVRISP/Lib/ISP/ISPProtocol.c
similarity index 100%
rename from Projects/AVRISP/Lib/ISPProtocol.c
rename to Projects/AVRISP/Lib/ISP/ISPProtocol.c
diff --git a/Projects/AVRISP/Lib/ISPProtocol.h b/Projects/AVRISP/Lib/ISP/ISPProtocol.h
similarity index 100%
rename from Projects/AVRISP/Lib/ISPProtocol.h
rename to Projects/AVRISP/Lib/ISP/ISPProtocol.h
diff --git a/Projects/AVRISP/Lib/ISPTarget.c b/Projects/AVRISP/Lib/ISP/ISPTarget.c
similarity index 100%
rename from Projects/AVRISP/Lib/ISPTarget.c
rename to Projects/AVRISP/Lib/ISP/ISPTarget.c
diff --git a/Projects/AVRISP/Lib/ISPTarget.h b/Projects/AVRISP/Lib/ISP/ISPTarget.h
similarity index 100%
rename from Projects/AVRISP/Lib/ISPTarget.h
rename to Projects/AVRISP/Lib/ISP/ISPTarget.h
diff --git a/Projects/AVRISP/Lib/PDIProtocol.c b/Projects/AVRISP/Lib/PDI/PDIProtocol.c
similarity index 100%
rename from Projects/AVRISP/Lib/PDIProtocol.c
rename to Projects/AVRISP/Lib/PDI/PDIProtocol.c
diff --git a/Projects/AVRISP/Lib/PDIProtocol.h b/Projects/AVRISP/Lib/PDI/PDIProtocol.h
similarity index 100%
rename from Projects/AVRISP/Lib/PDIProtocol.h
rename to Projects/AVRISP/Lib/PDI/PDIProtocol.h
diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDI/PDITarget.c
similarity index 100%
rename from Projects/AVRISP/Lib/PDITarget.c
rename to Projects/AVRISP/Lib/PDI/PDITarget.c
diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDI/PDITarget.h
similarity index 100%
rename from Projects/AVRISP/Lib/PDITarget.h
rename to Projects/AVRISP/Lib/PDI/PDITarget.h
diff --git a/Projects/AVRISP/Lib/XMEGANVM.c b/Projects/AVRISP/Lib/PDI/XMEGANVM.c
similarity index 100%
rename from Projects/AVRISP/Lib/XMEGANVM.c
rename to Projects/AVRISP/Lib/PDI/XMEGANVM.c
diff --git a/Projects/AVRISP/Lib/XMEGANVM.h b/Projects/AVRISP/Lib/PDI/XMEGANVM.h
similarity index 100%
rename from Projects/AVRISP/Lib/XMEGANVM.h
rename to Projects/AVRISP/Lib/PDI/XMEGANVM.h
diff --git a/Projects/AVRISP/Lib/TINYNVM.c b/Projects/AVRISP/Lib/TPI/TINYNVM.c
similarity index 100%
rename from Projects/AVRISP/Lib/TINYNVM.c
rename to Projects/AVRISP/Lib/TPI/TINYNVM.c
diff --git a/Projects/AVRISP/Lib/TINYNVM.h b/Projects/AVRISP/Lib/TPI/TINYNVM.h
similarity index 100%
rename from Projects/AVRISP/Lib/TINYNVM.h
rename to Projects/AVRISP/Lib/TPI/TINYNVM.h
diff --git a/Projects/AVRISP/Lib/TPIProtocol.c b/Projects/AVRISP/Lib/TPI/TPIProtocol.c
similarity index 100%
rename from Projects/AVRISP/Lib/TPIProtocol.c
rename to Projects/AVRISP/Lib/TPI/TPIProtocol.c
diff --git a/Projects/AVRISP/Lib/TPIProtocol.h b/Projects/AVRISP/Lib/TPI/TPIProtocol.h
similarity index 100%
rename from Projects/AVRISP/Lib/TPIProtocol.h
rename to Projects/AVRISP/Lib/TPI/TPIProtocol.h
diff --git a/Projects/AVRISP/Lib/TPITarget.c b/Projects/AVRISP/Lib/TPI/TPITarget.c
similarity index 100%
rename from Projects/AVRISP/Lib/TPITarget.c
rename to Projects/AVRISP/Lib/TPI/TPITarget.c
diff --git a/Projects/AVRISP/Lib/TPITarget.h b/Projects/AVRISP/Lib/TPI/TPITarget.h
similarity index 100%
rename from Projects/AVRISP/Lib/TPITarget.h
rename to Projects/AVRISP/Lib/TPI/TPITarget.h