diff --git a/fast-classifier/Makefile b/shortcut-fe/fast-classifier/Makefile
similarity index 100%
rename from fast-classifier/Makefile
rename to shortcut-fe/fast-classifier/Makefile
diff --git a/fast-classifier/src/Makefile b/shortcut-fe/fast-classifier/src/Makefile
similarity index 100%
rename from fast-classifier/src/Makefile
rename to shortcut-fe/fast-classifier/src/Makefile
diff --git a/fast-classifier/src/fast-classifier.c b/shortcut-fe/fast-classifier/src/fast-classifier.c
similarity index 100%
rename from fast-classifier/src/fast-classifier.c
rename to shortcut-fe/fast-classifier/src/fast-classifier.c
diff --git a/fast-classifier/src/fast-classifier.h b/shortcut-fe/fast-classifier/src/fast-classifier.h
similarity index 100%
rename from fast-classifier/src/fast-classifier.h
rename to shortcut-fe/fast-classifier/src/fast-classifier.h
diff --git a/fast-classifier/src/nl_classifier_test.c b/shortcut-fe/fast-classifier/src/nl_classifier_test.c
similarity index 100%
rename from fast-classifier/src/nl_classifier_test.c
rename to shortcut-fe/fast-classifier/src/nl_classifier_test.c
diff --git a/fast-classifier/src/userspace_example.c b/shortcut-fe/fast-classifier/src/userspace_example.c
similarity index 100%
rename from fast-classifier/src/userspace_example.c
rename to shortcut-fe/fast-classifier/src/userspace_example.c
diff --git a/shortcut-fe/Makefile b/shortcut-fe/shortcut-fe/Makefile
similarity index 100%
rename from shortcut-fe/Makefile
rename to shortcut-fe/shortcut-fe/Makefile
diff --git a/shortcut-fe/files/etc/init.d/shortcut-fe b/shortcut-fe/shortcut-fe/files/etc/init.d/shortcut-fe
similarity index 100%
rename from shortcut-fe/files/etc/init.d/shortcut-fe
rename to shortcut-fe/shortcut-fe/files/etc/init.d/shortcut-fe
diff --git a/shortcut-fe/files/usr/bin/sfe_dump b/shortcut-fe/shortcut-fe/files/usr/bin/sfe_dump
similarity index 100%
rename from shortcut-fe/files/usr/bin/sfe_dump
rename to shortcut-fe/shortcut-fe/files/usr/bin/sfe_dump
diff --git a/shortcut-fe/src/Kconfig b/shortcut-fe/shortcut-fe/src/Kconfig
similarity index 100%
rename from shortcut-fe/src/Kconfig
rename to shortcut-fe/shortcut-fe/src/Kconfig
diff --git a/shortcut-fe/src/Makefile b/shortcut-fe/shortcut-fe/src/Makefile
similarity index 100%
rename from shortcut-fe/src/Makefile
rename to shortcut-fe/shortcut-fe/src/Makefile
diff --git a/shortcut-fe/src/sfe.h b/shortcut-fe/shortcut-fe/src/sfe.h
similarity index 100%
rename from shortcut-fe/src/sfe.h
rename to shortcut-fe/shortcut-fe/src/sfe.h
diff --git a/shortcut-fe/src/sfe_backport.h b/shortcut-fe/shortcut-fe/src/sfe_backport.h
similarity index 100%
rename from shortcut-fe/src/sfe_backport.h
rename to shortcut-fe/shortcut-fe/src/sfe_backport.h
diff --git a/shortcut-fe/src/sfe_cm.c b/shortcut-fe/shortcut-fe/src/sfe_cm.c
similarity index 100%
rename from shortcut-fe/src/sfe_cm.c
rename to shortcut-fe/shortcut-fe/src/sfe_cm.c
diff --git a/shortcut-fe/src/sfe_cm.h b/shortcut-fe/shortcut-fe/src/sfe_cm.h
similarity index 100%
rename from shortcut-fe/src/sfe_cm.h
rename to shortcut-fe/shortcut-fe/src/sfe_cm.h
diff --git a/shortcut-fe/src/sfe_ipv4.c b/shortcut-fe/shortcut-fe/src/sfe_ipv4.c
similarity index 100%
rename from shortcut-fe/src/sfe_ipv4.c
rename to shortcut-fe/shortcut-fe/src/sfe_ipv4.c
diff --git a/shortcut-fe/src/sfe_ipv6.c b/shortcut-fe/shortcut-fe/src/sfe_ipv6.c
similarity index 100%
rename from shortcut-fe/src/sfe_ipv6.c
rename to shortcut-fe/shortcut-fe/src/sfe_ipv6.c
diff --git a/simulated-driver/Makefile b/shortcut-fe/simulated-driver/Makefile
similarity index 100%
rename from simulated-driver/Makefile
rename to shortcut-fe/simulated-driver/Makefile
diff --git a/simulated-driver/patches/200-nss-qdisc-support.patch b/shortcut-fe/simulated-driver/patches/200-nss-qdisc-support.patch
similarity index 100%
rename from simulated-driver/patches/200-nss-qdisc-support.patch
rename to shortcut-fe/simulated-driver/patches/200-nss-qdisc-support.patch