diff --git a/uisimulator/Makefile b/uisimulator/x11/Makefile
similarity index 100%
rename from uisimulator/Makefile
rename to uisimulator/x11/Makefile
diff --git a/uisimulator/README b/uisimulator/x11/README
similarity index 100%
rename from uisimulator/README
rename to uisimulator/x11/README
diff --git a/uisimulator/button-x11.c b/uisimulator/x11/button-x11.c
similarity index 100%
rename from uisimulator/button-x11.c
rename to uisimulator/x11/button-x11.c
diff --git a/uisimulator/config.h b/uisimulator/x11/config.h
similarity index 100%
rename from uisimulator/config.h
rename to uisimulator/x11/config.h
diff --git a/uisimulator/lcd-x11.c b/uisimulator/x11/lcd-x11.c
similarity index 100%
rename from uisimulator/lcd-x11.c
rename to uisimulator/x11/lcd-x11.c
diff --git a/uisimulator/lcd-x11.h b/uisimulator/x11/lcd-x11.h
similarity index 100%
rename from uisimulator/lcd-x11.h
rename to uisimulator/x11/lcd-x11.h
diff --git a/uisimulator/resources.c b/uisimulator/x11/resources.c
similarity index 100%
rename from uisimulator/resources.c
rename to uisimulator/x11/resources.c
diff --git a/uisimulator/resources.h b/uisimulator/x11/resources.h
similarity index 100%
rename from uisimulator/resources.h
rename to uisimulator/x11/resources.h
diff --git a/uisimulator/screenhack.c b/uisimulator/x11/screenhack.c
similarity index 100%
rename from uisimulator/screenhack.c
rename to uisimulator/x11/screenhack.c
diff --git a/uisimulator/screenhack.h b/uisimulator/x11/screenhack.h
similarity index 100%
rename from uisimulator/screenhack.h
rename to uisimulator/x11/screenhack.h
diff --git a/uisimulator/uibasic.c b/uisimulator/x11/uibasic.c
similarity index 100%
rename from uisimulator/uibasic.c
rename to uisimulator/x11/uibasic.c
diff --git a/uisimulator/utils.h b/uisimulator/x11/utils.h
similarity index 100%
rename from uisimulator/utils.h
rename to uisimulator/x11/utils.h
diff --git a/uisimulator/version.h b/uisimulator/x11/version.h
similarity index 100%
rename from uisimulator/version.h
rename to uisimulator/x11/version.h
diff --git a/uisimulator/visual.c b/uisimulator/x11/visual.c
similarity index 100%
rename from uisimulator/visual.c
rename to uisimulator/x11/visual.c
diff --git a/uisimulator/visual.h b/uisimulator/x11/visual.h
similarity index 100%
rename from uisimulator/visual.h
rename to uisimulator/x11/visual.h
diff --git a/uisimulator/vroot.h b/uisimulator/x11/vroot.h
similarity index 100%
rename from uisimulator/vroot.h
rename to uisimulator/x11/vroot.h
diff --git a/uisimulator/xmu.h b/uisimulator/x11/xmu.h
similarity index 100%
rename from uisimulator/xmu.h
rename to uisimulator/x11/xmu.h