diff --git a/.gitignore b/.gitignore index 718c43f..1fcb152 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ueforth/out +out diff --git a/ueforth/Makefile b/Makefile similarity index 100% rename from ueforth/Makefile rename to Makefile diff --git a/README.md b/README.md index e800275..0a7a3d7 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,17 @@ -# EForth +# µEforth / ESP32forth -EForth is a delightfully minimalist approach to Forth originated by Bill Muench and Dr. C. H. Ting. +This EForth inspired implementation of Forth is bootstraped from a minimalist C kernel. -For documentation visit: +## Building from Source -[https://eforth.appspot.com/](https://eforth.appspot.com/) +To build: -## Directories +``` +make +``` -* [ueforth/ - µEforth / ESP32forth](ueforth/README.md) - EForth refactored to allow source boostraping. -* [circleforth/ - CircleForth](circleforth/README.md) - A minimalist Forth modeled after toy Lisps. +The resulting output will have this structure: + +* out/deploy - A copy of the eforth.appspot.com / esp32forth.appspot.com ready to deploy. +* out/windows - A build for Windows. +* out/linux - A build for Linux. diff --git a/circleforth/README.md b/attic/circleforth/README.md similarity index 100% rename from circleforth/README.md rename to attic/circleforth/README.md diff --git a/circleforth/circle.fs b/attic/circleforth/circle.fs similarity index 100% rename from circleforth/circle.fs rename to attic/circleforth/circle.fs diff --git a/circleforth/compound.fs b/attic/circleforth/compound.fs similarity index 100% rename from circleforth/compound.fs rename to attic/circleforth/compound.fs diff --git a/ueforth/common/all_tests.fs b/common/all_tests.fs similarity index 100% rename from ueforth/common/all_tests.fs rename to common/all_tests.fs diff --git a/ueforth/common/ansi.fs b/common/ansi.fs similarity index 100% rename from ueforth/common/ansi.fs rename to common/ansi.fs diff --git a/ueforth/common/base_tests.fs b/common/base_tests.fs similarity index 100% rename from ueforth/common/base_tests.fs rename to common/base_tests.fs diff --git a/ueforth/common/blocks.fs b/common/blocks.fs similarity index 100% rename from ueforth/common/blocks.fs rename to common/blocks.fs diff --git a/ueforth/common/boot.fs b/common/boot.fs similarity index 100% rename from ueforth/common/boot.fs rename to common/boot.fs diff --git a/ueforth/common/calling.h b/common/calling.h similarity index 100% rename from ueforth/common/calling.h rename to common/calling.h diff --git a/ueforth/common/calls.h b/common/calls.h similarity index 100% rename from ueforth/common/calls.h rename to common/calls.h diff --git a/ueforth/common/conditionals.fs b/common/conditionals.fs similarity index 100% rename from ueforth/common/conditionals.fs rename to common/conditionals.fs diff --git a/ueforth/common/conditionals_tests.fs b/common/conditionals_tests.fs similarity index 100% rename from ueforth/common/conditionals_tests.fs rename to common/conditionals_tests.fs diff --git a/ueforth/common/core.h b/common/core.h similarity index 100% rename from ueforth/common/core.h rename to common/core.h diff --git a/ueforth/common/desktop.fs b/common/desktop.fs similarity index 100% rename from ueforth/common/desktop.fs rename to common/desktop.fs diff --git a/ueforth/common/doloop_tests.fs b/common/doloop_tests.fs similarity index 100% rename from ueforth/common/doloop_tests.fs rename to common/doloop_tests.fs diff --git a/ueforth/common/editor.fs b/common/editor.fs similarity index 100% rename from ueforth/common/editor.fs rename to common/editor.fs diff --git a/ueforth/common/extra.fs b/common/extra.fs similarity index 100% rename from ueforth/common/extra.fs rename to common/extra.fs diff --git a/ueforth/common/extra_opcodes.h b/common/extra_opcodes.h similarity index 100% rename from ueforth/common/extra_opcodes.h rename to common/extra_opcodes.h diff --git a/ueforth/common/filetools.fs b/common/filetools.fs similarity index 100% rename from ueforth/common/filetools.fs rename to common/filetools.fs diff --git a/ueforth/common/fini.fs b/common/fini.fs similarity index 100% rename from ueforth/common/fini.fs rename to common/fini.fs diff --git a/ueforth/common/float_tests.fs b/common/float_tests.fs similarity index 100% rename from ueforth/common/float_tests.fs rename to common/float_tests.fs diff --git a/ueforth/common/floats.fs b/common/floats.fs similarity index 100% rename from ueforth/common/floats.fs rename to common/floats.fs diff --git a/ueforth/common/floats.h b/common/floats.h similarity index 100% rename from ueforth/common/floats.h rename to common/floats.h diff --git a/ueforth/common/forth_namespace_tests.fs b/common/forth_namespace_tests.fs similarity index 100% rename from ueforth/common/forth_namespace_tests.fs rename to common/forth_namespace_tests.fs diff --git a/ueforth/common/grf.fs b/common/grf.fs similarity index 100% rename from ueforth/common/grf.fs rename to common/grf.fs diff --git a/ueforth/common/grf_test.fs b/common/grf_test.fs similarity index 100% rename from ueforth/common/grf_test.fs rename to common/grf_test.fs diff --git a/ueforth/common/grf_utils.fs b/common/grf_utils.fs similarity index 100% rename from ueforth/common/grf_utils.fs rename to common/grf_utils.fs diff --git a/ueforth/common/heart.fs b/common/heart.fs similarity index 100% rename from ueforth/common/heart.fs rename to common/heart.fs diff --git a/ueforth/common/including.fs b/common/including.fs similarity index 100% rename from ueforth/common/including.fs rename to common/including.fs diff --git a/ueforth/common/interp.h b/common/interp.h similarity index 100% rename from ueforth/common/interp.h rename to common/interp.h diff --git a/ueforth/common/locals.fs b/common/locals.fs similarity index 100% rename from ueforth/common/locals.fs rename to common/locals.fs diff --git a/ueforth/common/locals_tests.fs b/common/locals_tests.fs similarity index 100% rename from ueforth/common/locals_tests.fs rename to common/locals_tests.fs diff --git a/ueforth/common/opcodes.h b/common/opcodes.h similarity index 100% rename from ueforth/common/opcodes.h rename to common/opcodes.h diff --git a/ueforth/common/source_to_string.js b/common/source_to_string.js similarity index 100% rename from ueforth/common/source_to_string.js rename to common/source_to_string.js diff --git a/ueforth/common/streams.fs b/common/streams.fs similarity index 100% rename from ueforth/common/streams.fs rename to common/streams.fs diff --git a/ueforth/common/structures.fs b/common/structures.fs similarity index 100% rename from ueforth/common/structures.fs rename to common/structures.fs diff --git a/ueforth/common/structures_tests.fs b/common/structures_tests.fs similarity index 100% rename from ueforth/common/structures_tests.fs rename to common/structures_tests.fs diff --git a/ueforth/common/tasking_tester.fs b/common/tasking_tester.fs similarity index 100% rename from ueforth/common/tasking_tester.fs rename to common/tasking_tester.fs diff --git a/ueforth/common/tasks.fs b/common/tasks.fs similarity index 100% rename from ueforth/common/tasks.fs rename to common/tasks.fs diff --git a/ueforth/common/testing.fs b/common/testing.fs similarity index 100% rename from ueforth/common/testing.fs rename to common/testing.fs diff --git a/ueforth/common/utils.fs b/common/utils.fs similarity index 100% rename from ueforth/common/utils.fs rename to common/utils.fs diff --git a/ueforth/common/utils_tests.fs b/common/utils_tests.fs similarity index 100% rename from ueforth/common/utils_tests.fs rename to common/utils_tests.fs diff --git a/ueforth/common/vocabulary.fs b/common/vocabulary.fs similarity index 100% rename from ueforth/common/vocabulary.fs rename to common/vocabulary.fs diff --git a/ueforth/common/vocabulary_tests.fs b/common/vocabulary_tests.fs similarity index 100% rename from ueforth/common/vocabulary_tests.fs rename to common/vocabulary_tests.fs diff --git a/ueforth/esp32/allocation.fs b/esp32/allocation.fs similarity index 100% rename from ueforth/esp32/allocation.fs rename to esp32/allocation.fs diff --git a/ueforth/esp32/autoboot.fs b/esp32/autoboot.fs similarity index 100% rename from ueforth/esp32/autoboot.fs rename to esp32/autoboot.fs diff --git a/ueforth/esp32/bindings.fs b/esp32/bindings.fs similarity index 100% rename from ueforth/esp32/bindings.fs rename to esp32/bindings.fs diff --git a/ueforth/esp32/bterm.fs b/esp32/bterm.fs similarity index 100% rename from ueforth/esp32/bterm.fs rename to esp32/bterm.fs diff --git a/ueforth/esp32/builtins.cpp b/esp32/builtins.cpp similarity index 100% rename from ueforth/esp32/builtins.cpp rename to esp32/builtins.cpp diff --git a/ueforth/esp32/builtins.h b/esp32/builtins.h similarity index 100% rename from ueforth/esp32/builtins.h rename to esp32/builtins.h diff --git a/ueforth/esp32/camera.fs b/esp32/camera.fs similarity index 100% rename from ueforth/esp32/camera.fs rename to esp32/camera.fs diff --git a/ueforth/esp32/camera_server.fs b/esp32/camera_server.fs similarity index 100% rename from ueforth/esp32/camera_server.fs rename to esp32/camera_server.fs diff --git a/ueforth/esp32/main.cpp b/esp32/main.cpp similarity index 100% rename from ueforth/esp32/main.cpp rename to esp32/main.cpp diff --git a/ueforth/esp32/options.h b/esp32/options.h similarity index 100% rename from ueforth/esp32/options.h rename to esp32/options.h diff --git a/ueforth/esp32/platform.fs b/esp32/platform.fs similarity index 100% rename from ueforth/esp32/platform.fs rename to esp32/platform.fs diff --git a/ueforth/esp32/print-builtins.cpp b/esp32/print-builtins.cpp similarity index 100% rename from ueforth/esp32/print-builtins.cpp rename to esp32/print-builtins.cpp diff --git a/ueforth/esp32/registers.fs b/esp32/registers.fs similarity index 100% rename from ueforth/esp32/registers.fs rename to esp32/registers.fs diff --git a/ueforth/esp32/sim_main.cpp b/esp32/sim_main.cpp similarity index 100% rename from ueforth/esp32/sim_main.cpp rename to esp32/sim_main.cpp diff --git a/ueforth/esp32/template.ino b/esp32/template.ino similarity index 100% rename from ueforth/esp32/template.ino rename to esp32/template.ino diff --git a/ueforth/esp32/timers.fs b/esp32/timers.fs similarity index 100% rename from ueforth/esp32/timers.fs rename to esp32/timers.fs diff --git a/ueforth/esp32/web_interface.fs b/esp32/web_interface.fs similarity index 100% rename from ueforth/esp32/web_interface.fs rename to esp32/web_interface.fs diff --git a/ueforth/examples/boxes.fs b/examples/boxes.fs similarity index 100% rename from ueforth/examples/boxes.fs rename to examples/boxes.fs diff --git a/ueforth/examples/heart_game.fs b/examples/heart_game.fs similarity index 100% rename from ueforth/examples/heart_game.fs rename to examples/heart_game.fs diff --git a/ueforth/examples/heart_graph.fs b/examples/heart_graph.fs similarity index 100% rename from ueforth/examples/heart_graph.fs rename to examples/heart_graph.fs diff --git a/ueforth/examples/httpd_sample.fs b/examples/httpd_sample.fs similarity index 100% rename from ueforth/examples/httpd_sample.fs rename to examples/httpd_sample.fs diff --git a/ueforth/examples/min_grf.fs b/examples/min_grf.fs similarity index 100% rename from ueforth/examples/min_grf.fs rename to examples/min_grf.fs diff --git a/ueforth/images/eforth.png b/images/eforth.png similarity index 100% rename from ueforth/images/eforth.png rename to images/eforth.png diff --git a/ueforth/posix/allocation.fs b/posix/allocation.fs similarity index 100% rename from ueforth/posix/allocation.fs rename to posix/allocation.fs diff --git a/ueforth/posix/autoboot.fs b/posix/autoboot.fs similarity index 100% rename from ueforth/posix/autoboot.fs rename to posix/autoboot.fs diff --git a/ueforth/posix/grf.fs b/posix/grf.fs similarity index 100% rename from ueforth/posix/grf.fs rename to posix/grf.fs diff --git a/ueforth/posix/httpd.fs b/posix/httpd.fs similarity index 100% rename from ueforth/posix/httpd.fs rename to posix/httpd.fs diff --git a/ueforth/posix/main.c b/posix/main.c similarity index 100% rename from ueforth/posix/main.c rename to posix/main.c diff --git a/ueforth/posix/posix.fs b/posix/posix.fs similarity index 100% rename from ueforth/posix/posix.fs rename to posix/posix.fs diff --git a/ueforth/posix/pthreads.fs b/posix/pthreads.fs similarity index 100% rename from ueforth/posix/pthreads.fs rename to posix/pthreads.fs diff --git a/ueforth/posix/shell.fs b/posix/shell.fs similarity index 100% rename from ueforth/posix/shell.fs rename to posix/shell.fs diff --git a/ueforth/posix/sockets.fs b/posix/sockets.fs similarity index 100% rename from ueforth/posix/sockets.fs rename to posix/sockets.fs diff --git a/ueforth/posix/telnetd.fs b/posix/telnetd.fs similarity index 100% rename from ueforth/posix/telnetd.fs rename to posix/telnetd.fs diff --git a/ueforth/posix/terminal.fs b/posix/terminal.fs similarity index 100% rename from ueforth/posix/terminal.fs rename to posix/terminal.fs diff --git a/ueforth/posix/termios.fs b/posix/termios.fs similarity index 100% rename from ueforth/posix/termios.fs rename to posix/termios.fs diff --git a/ueforth/posix/web_interface.fs b/posix/web_interface.fs similarity index 100% rename from ueforth/posix/web_interface.fs rename to posix/web_interface.fs diff --git a/ueforth/posix/x11.fs b/posix/x11.fs similarity index 100% rename from ueforth/posix/x11.fs rename to posix/x11.fs diff --git a/ueforth/posix/x11_test.fs b/posix/x11_test.fs similarity index 100% rename from ueforth/posix/x11_test.fs rename to posix/x11_test.fs diff --git a/ueforth/site/.gcloudignore b/site/.gcloudignore similarity index 100% rename from ueforth/site/.gcloudignore rename to site/.gcloudignore diff --git a/ueforth/site/ESP32forth.html b/site/ESP32forth.html similarity index 98% rename from ueforth/site/ESP32forth.html rename to site/ESP32forth.html index 07984e1..1792374 100644 --- a/ueforth/site/ESP32forth.html +++ b/site/ESP32forth.html @@ -50,7 +50,7 @@ limitations under the License.

http://github.com/flagxor/eforth - - Complete Unprocessed Source Code (under ueforth/) + - Complete Unprocessed Source Code

License

@@ -330,7 +330,7 @@ In popular cases a shorted higher level name is provided.

-See template.ino. +See template.ino.

Allocation
@@ -876,7 +876,7 @@ z" NETWORK-NAME" z" PASSWORD" webui

-See web_interface.fs. +See web_interface.fs.

Autoexec.fs

@@ -912,7 +912,7 @@ s" /spiffs/autoexec.fs" delete-file

-See autoboot.fs. +See autoboot.fs.

Adding Words

diff --git a/ueforth/site/app.yaml b/site/app.yaml similarity index 100% rename from ueforth/site/app.yaml rename to site/app.yaml diff --git a/ueforth/site/classic.html b/site/classic.html similarity index 100% rename from ueforth/site/classic.html rename to site/classic.html diff --git a/ueforth/site/common.html b/site/common.html similarity index 100% rename from ueforth/site/common.html rename to site/common.html diff --git a/ueforth/site/desktop_common.html b/site/desktop_common.html similarity index 92% rename from ueforth/site/desktop_common.html rename to site/desktop_common.html index e5e39aa..6e20faf 100644 --- a/ueforth/site/desktop_common.html +++ b/site/desktop_common.html @@ -39,5 +39,5 @@ CALL10 ( n n n n n n n n n n fn -- n )

-See calling.h. +See calling.h.

diff --git a/ueforth/site/eforth.go b/site/eforth.go similarity index 100% rename from ueforth/site/eforth.go rename to site/eforth.go diff --git a/ueforth/site/index.html b/site/index.html similarity index 100% rename from ueforth/site/index.html rename to site/index.html diff --git a/ueforth/site/internals.html b/site/internals.html similarity index 94% rename from ueforth/site/internals.html rename to site/internals.html index b327483..4194820 100644 --- a/ueforth/site/internals.html +++ b/site/internals.html @@ -50,7 +50,7 @@ interprets or compiles it (reusing PARSE,

-See core.h. +See core.h.

@@ -98,7 +98,7 @@ additional non-essential extra opcodes were added in place of high-level words.

-See opcodes.h. +See opcodes.h.

diff --git a/ueforth/site/linux.html b/site/linux.html similarity index 87% rename from ueforth/site/linux.html rename to site/linux.html index 141523d..2f24193 100644 --- a/ueforth/site/linux.html +++ b/site/linux.html @@ -49,7 +49,7 @@ limitations under the License.

http://github.com/flagxor/eforth - - Complete Unprocessed Source Code (under ueforth) + - Complete Unprocessed Source Code

µEforth

@@ -76,7 +76,7 @@ DLSYM ( module name-z -- fn )

-See posix_main.c. +See posix_main.c.

@@ -87,8 +87,8 @@ Native functions all called with CALL(n) (see Windows & Linux Calling below)

Various Linux calls including Xlib are imported in -posix.fs and -xlib.fs. +posix.fs and +xlib.fs. In addition, TYPE and KEY are connected to stdin and stdout.

diff --git a/ueforth/site/menu.html b/site/menu.html similarity index 100% rename from ueforth/site/menu.html rename to site/menu.html diff --git a/ueforth/site/posix_common.html b/site/posix_common.html similarity index 100% rename from ueforth/site/posix_common.html rename to site/posix_common.html diff --git a/ueforth/site/static/eforth.css b/site/static/eforth.css similarity index 100% rename from ueforth/site/static/eforth.css rename to site/static/eforth.css diff --git a/ueforth/site/static/esp-cam-back.jpg b/site/static/esp-cam-back.jpg similarity index 100% rename from ueforth/site/static/esp-cam-back.jpg rename to site/static/esp-cam-back.jpg diff --git a/ueforth/site/static/esp-cam-front.jpg b/site/static/esp-cam-front.jpg similarity index 100% rename from ueforth/site/static/esp-cam-front.jpg rename to site/static/esp-cam-front.jpg diff --git a/ueforth/site/static/esp-cam-wiring.jpg b/site/static/esp-cam-wiring.jpg similarity index 100% rename from ueforth/site/static/esp-cam-wiring.jpg rename to site/static/esp-cam-wiring.jpg diff --git a/ueforth/site/static/esp32-c3-mini-1.jpg b/site/static/esp32-c3-mini-1.jpg similarity index 100% rename from ueforth/site/static/esp32-c3-mini-1.jpg rename to site/static/esp32-c3-mini-1.jpg diff --git a/ueforth/site/static/esp32-c3-wroom-02.jpg b/site/static/esp32-c3-wroom-02.jpg similarity index 100% rename from ueforth/site/static/esp32-c3-wroom-02.jpg rename to site/static/esp32-c3-wroom-02.jpg diff --git a/ueforth/site/static/esp32-mini-1.jpg b/site/static/esp32-mini-1.jpg similarity index 100% rename from ueforth/site/static/esp32-mini-1.jpg rename to site/static/esp32-mini-1.jpg diff --git a/ueforth/site/static/esp32-s2-wroom.jpg b/site/static/esp32-s2-wroom.jpg similarity index 100% rename from ueforth/site/static/esp32-s2-wroom.jpg rename to site/static/esp32-s2-wroom.jpg diff --git a/ueforth/site/static/esp32-s2-wrover.jpg b/site/static/esp32-s2-wrover.jpg similarity index 100% rename from ueforth/site/static/esp32-s2-wrover.jpg rename to site/static/esp32-s2-wrover.jpg diff --git a/ueforth/site/static/esp32-wroom.jpg b/site/static/esp32-wroom.jpg similarity index 100% rename from ueforth/site/static/esp32-wroom.jpg rename to site/static/esp32-wroom.jpg diff --git a/ueforth/site/static/robots.txt b/site/static/robots.txt similarity index 100% rename from ueforth/site/static/robots.txt rename to site/static/robots.txt diff --git a/ueforth/site/static/serial_bridge.jpg b/site/static/serial_bridge.jpg similarity index 100% rename from ueforth/site/static/serial_bridge.jpg rename to site/static/serial_bridge.jpg diff --git a/ueforth/site/windows.html b/site/windows.html similarity index 91% rename from ueforth/site/windows.html rename to site/windows.html index ed769b9..bc51e6a 100644 --- a/ueforth/site/windows.html +++ b/site/windows.html @@ -53,7 +53,7 @@ limitations under the License.

http://github.com/flagxor/eforth - - Complete Unprocessed Source Code (under ueforth) + - Complete Unprocessed Source Code

µEforth

@@ -84,7 +84,7 @@ including MSVCRT.

-See windows_main.c. +See windows_main.c.

@@ -95,7 +95,7 @@ Native functions all called with CALL(n) (see Windows & Linux Calling below)

Various Win32 calls are imported in -windows.fs. +windows.fs. In addition, a terminal that responds to ANSI escape codes is created and connected to TYPE and KEY.

diff --git a/ueforth/tools/memuse.py b/tools/memuse.py similarity index 100% rename from ueforth/tools/memuse.py rename to tools/memuse.py diff --git a/ueforth/tools/replace.js b/tools/replace.js similarity index 100% rename from ueforth/tools/replace.js rename to tools/replace.js diff --git a/ueforth/tools/webindex.py b/tools/webindex.py similarity index 100% rename from ueforth/tools/webindex.py rename to tools/webindex.py diff --git a/ueforth/README.md b/ueforth/README.md deleted file mode 100644 index 0a7a3d7..0000000 --- a/ueforth/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# µEforth / ESP32forth - -This EForth inspired implementation of Forth is bootstraped from a minimalist C kernel. - -## Building from Source - -To build: - -``` -make -``` - -The resulting output will have this structure: - -* out/deploy - A copy of the eforth.appspot.com / esp32forth.appspot.com ready to deploy. -* out/windows - A build for Windows. -* out/linux - A build for Linux. diff --git a/ueforth/web/dump_web_opcodes.c b/web/dump_web_opcodes.c similarity index 100% rename from ueforth/web/dump_web_opcodes.c rename to web/dump_web_opcodes.c diff --git a/ueforth/web/fuse_web.js b/web/fuse_web.js similarity index 100% rename from ueforth/web/fuse_web.js rename to web/fuse_web.js diff --git a/ueforth/web/terminal.html b/web/terminal.html similarity index 100% rename from ueforth/web/terminal.html rename to web/terminal.html diff --git a/ueforth/web/web.template.js b/web/web.template.js similarity index 100% rename from ueforth/web/web.template.js rename to web/web.template.js diff --git a/ueforth/windows/allocation.fs b/windows/allocation.fs similarity index 100% rename from ueforth/windows/allocation.fs rename to windows/allocation.fs diff --git a/ueforth/windows/grf.fs b/windows/grf.fs similarity index 100% rename from ueforth/windows/grf.fs rename to windows/grf.fs diff --git a/ueforth/windows/interp.h b/windows/interp.h similarity index 100% rename from ueforth/windows/interp.h rename to windows/interp.h diff --git a/ueforth/windows/main.c b/windows/main.c similarity index 100% rename from ueforth/windows/main.c rename to windows/main.c diff --git a/ueforth/windows/terminal.fs b/windows/terminal.fs similarity index 100% rename from ueforth/windows/terminal.fs rename to windows/terminal.fs diff --git a/ueforth/windows/ueforth.rc b/windows/ueforth.rc similarity index 100% rename from ueforth/windows/ueforth.rc rename to windows/ueforth.rc diff --git a/ueforth/windows/windows_console.fs b/windows/windows_console.fs similarity index 100% rename from ueforth/windows/windows_console.fs rename to windows/windows_console.fs diff --git a/ueforth/windows/windows_core.fs b/windows/windows_core.fs similarity index 100% rename from ueforth/windows/windows_core.fs rename to windows/windows_core.fs diff --git a/ueforth/windows/windows_files.fs b/windows/windows_files.fs similarity index 100% rename from ueforth/windows/windows_files.fs rename to windows/windows_files.fs diff --git a/ueforth/windows/windows_gdi.fs b/windows/windows_gdi.fs similarity index 100% rename from ueforth/windows/windows_gdi.fs rename to windows/windows_gdi.fs diff --git a/ueforth/windows/windows_messages.fs b/windows/windows_messages.fs similarity index 100% rename from ueforth/windows/windows_messages.fs rename to windows/windows_messages.fs diff --git a/ueforth/windows/windows_test.fs b/windows/windows_test.fs similarity index 100% rename from ueforth/windows/windows_test.fs rename to windows/windows_test.fs diff --git a/ueforth/windows/windows_user.fs b/windows/windows_user.fs similarity index 100% rename from ueforth/windows/windows_user.fs rename to windows/windows_user.fs