diff --git a/reactos/subsys/system/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c
similarity index 100%
rename from reactos/subsys/system/usetup/bootsup.c
rename to reactos/base/setup/usetup/bootsup.c
diff --git a/reactos/subsys/system/usetup/bootsup.h b/reactos/base/setup/usetup/bootsup.h
similarity index 100%
rename from reactos/subsys/system/usetup/bootsup.h
rename to reactos/base/setup/usetup/bootsup.h
diff --git a/reactos/subsys/system/usetup/cabinet.c b/reactos/base/setup/usetup/cabinet.c
similarity index 100%
rename from reactos/subsys/system/usetup/cabinet.c
rename to reactos/base/setup/usetup/cabinet.c
diff --git a/reactos/subsys/system/usetup/cabinet.h b/reactos/base/setup/usetup/cabinet.h
similarity index 100%
rename from reactos/subsys/system/usetup/cabinet.h
rename to reactos/base/setup/usetup/cabinet.h
diff --git a/reactos/subsys/system/usetup/console.c b/reactos/base/setup/usetup/console.c
similarity index 100%
rename from reactos/subsys/system/usetup/console.c
rename to reactos/base/setup/usetup/console.c
diff --git a/reactos/subsys/system/usetup/console.h b/reactos/base/setup/usetup/console.h
similarity index 100%
rename from reactos/subsys/system/usetup/console.h
rename to reactos/base/setup/usetup/console.h
diff --git a/reactos/subsys/system/usetup/drivesup.c b/reactos/base/setup/usetup/drivesup.c
similarity index 100%
rename from reactos/subsys/system/usetup/drivesup.c
rename to reactos/base/setup/usetup/drivesup.c
diff --git a/reactos/subsys/system/usetup/drivesup.h b/reactos/base/setup/usetup/drivesup.h
similarity index 100%
rename from reactos/subsys/system/usetup/drivesup.h
rename to reactos/base/setup/usetup/drivesup.h
diff --git a/reactos/subsys/system/usetup/filequeue.c b/reactos/base/setup/usetup/filequeue.c
similarity index 100%
rename from reactos/subsys/system/usetup/filequeue.c
rename to reactos/base/setup/usetup/filequeue.c
diff --git a/reactos/subsys/system/usetup/filequeue.h b/reactos/base/setup/usetup/filequeue.h
similarity index 100%
rename from reactos/subsys/system/usetup/filequeue.h
rename to reactos/base/setup/usetup/filequeue.h
diff --git a/reactos/subsys/system/usetup/filesup.c b/reactos/base/setup/usetup/filesup.c
similarity index 100%
rename from reactos/subsys/system/usetup/filesup.c
rename to reactos/base/setup/usetup/filesup.c
diff --git a/reactos/subsys/system/usetup/filesup.h b/reactos/base/setup/usetup/filesup.h
similarity index 100%
rename from reactos/subsys/system/usetup/filesup.h
rename to reactos/base/setup/usetup/filesup.h
diff --git a/reactos/subsys/system/usetup/format.c b/reactos/base/setup/usetup/format.c
similarity index 100%
rename from reactos/subsys/system/usetup/format.c
rename to reactos/base/setup/usetup/format.c
diff --git a/reactos/subsys/system/usetup/format.h b/reactos/base/setup/usetup/format.h
similarity index 100%
rename from reactos/subsys/system/usetup/format.h
rename to reactos/base/setup/usetup/format.h
diff --git a/reactos/subsys/system/usetup/fslist.c b/reactos/base/setup/usetup/fslist.c
similarity index 100%
rename from reactos/subsys/system/usetup/fslist.c
rename to reactos/base/setup/usetup/fslist.c
diff --git a/reactos/subsys/system/usetup/fslist.h b/reactos/base/setup/usetup/fslist.h
similarity index 100%
rename from reactos/subsys/system/usetup/fslist.h
rename to reactos/base/setup/usetup/fslist.h
diff --git a/reactos/subsys/system/usetup/genlist.c b/reactos/base/setup/usetup/genlist.c
similarity index 100%
rename from reactos/subsys/system/usetup/genlist.c
rename to reactos/base/setup/usetup/genlist.c
diff --git a/reactos/subsys/system/usetup/genlist.h b/reactos/base/setup/usetup/genlist.h
similarity index 100%
rename from reactos/subsys/system/usetup/genlist.h
rename to reactos/base/setup/usetup/genlist.h
diff --git a/reactos/subsys/system/usetup/inicache.c b/reactos/base/setup/usetup/inicache.c
similarity index 100%
rename from reactos/subsys/system/usetup/inicache.c
rename to reactos/base/setup/usetup/inicache.c
diff --git a/reactos/subsys/system/usetup/inicache.h b/reactos/base/setup/usetup/inicache.h
similarity index 100%
rename from reactos/subsys/system/usetup/inicache.h
rename to reactos/base/setup/usetup/inicache.h
diff --git a/reactos/subsys/system/usetup/keytrans.c b/reactos/base/setup/usetup/keytrans.c
similarity index 100%
rename from reactos/subsys/system/usetup/keytrans.c
rename to reactos/base/setup/usetup/keytrans.c
diff --git a/reactos/subsys/system/usetup/keytrans.h b/reactos/base/setup/usetup/keytrans.h
similarity index 100%
rename from reactos/subsys/system/usetup/keytrans.h
rename to reactos/base/setup/usetup/keytrans.h
diff --git a/reactos/subsys/system/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c
similarity index 100%
rename from reactos/subsys/system/usetup/partlist.c
rename to reactos/base/setup/usetup/partlist.c
diff --git a/reactos/subsys/system/usetup/partlist.h b/reactos/base/setup/usetup/partlist.h
similarity index 100%
rename from reactos/subsys/system/usetup/partlist.h
rename to reactos/base/setup/usetup/partlist.h
diff --git a/reactos/subsys/system/usetup/progress.c b/reactos/base/setup/usetup/progress.c
similarity index 100%
rename from reactos/subsys/system/usetup/progress.c
rename to reactos/base/setup/usetup/progress.c
diff --git a/reactos/subsys/system/usetup/progress.h b/reactos/base/setup/usetup/progress.h
similarity index 100%
rename from reactos/subsys/system/usetup/progress.h
rename to reactos/base/setup/usetup/progress.h
diff --git a/reactos/subsys/system/usetup/registry.c b/reactos/base/setup/usetup/registry.c
similarity index 100%
rename from reactos/subsys/system/usetup/registry.c
rename to reactos/base/setup/usetup/registry.c
diff --git a/reactos/subsys/system/usetup/registry.h b/reactos/base/setup/usetup/registry.h
similarity index 100%
rename from reactos/subsys/system/usetup/registry.h
rename to reactos/base/setup/usetup/registry.h
diff --git a/reactos/subsys/system/usetup/settings.c b/reactos/base/setup/usetup/settings.c
similarity index 100%
rename from reactos/subsys/system/usetup/settings.c
rename to reactos/base/setup/usetup/settings.c
diff --git a/reactos/subsys/system/usetup/settings.h b/reactos/base/setup/usetup/settings.h
similarity index 100%
rename from reactos/subsys/system/usetup/settings.h
rename to reactos/base/setup/usetup/settings.h
diff --git a/reactos/subsys/system/usetup/usetup.c b/reactos/base/setup/usetup/usetup.c
similarity index 100%
rename from reactos/subsys/system/usetup/usetup.c
rename to reactos/base/setup/usetup/usetup.c
diff --git a/reactos/subsys/system/usetup/usetup.h b/reactos/base/setup/usetup/usetup.h
similarity index 100%
rename from reactos/subsys/system/usetup/usetup.h
rename to reactos/base/setup/usetup/usetup.h
diff --git a/reactos/subsys/system/usetup/usetup.rc b/reactos/base/setup/usetup/usetup.rc
similarity index 100%
rename from reactos/subsys/system/usetup/usetup.rc
rename to reactos/base/setup/usetup/usetup.rc
diff --git a/reactos/subsys/system/usetup/usetup.xml b/reactos/base/setup/usetup/usetup.xml
similarity index 100%
rename from reactos/subsys/system/usetup/usetup.xml
rename to reactos/base/setup/usetup/usetup.xml