diff --git a/Makefile b/Makefile
index c347737..583cfd9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,131 +2,164 @@
 #
 # Builds the full DVX stack: core library, task switcher,
 # bootstrap loader, text help library, widgets, shell, and apps.
+#
+# Source tree mirrors bin/ layout:
+#   src/libs/kpunch/<libname>/   -> bin/libs/kpunch/<libname>/<libname>.lib
+#   src/widgets/kpunch/<widget>/ -> bin/widgets/kpunch/<widget>/<widget>.wgt
+#   src/apps/kpunch/<app>/       -> bin/apps/kpunch/<app>/<app>.app
+#   src/loader/                  -> bin/DVX.EXE
+#   src/tools/                   -> bin/host/<tool>
 
-.PHONY: all clean core tasks loader texthelp listhelp widgets shell taskmgr serial sql apps tools deploy-helpsrc compile-help deploy-sdk
+.PHONY: all clean libdvx libtasks loader texthelp listhelp widgets dvxshell taskmgr serial sql apps tools deploy-helpsrc compile-help deploy-sdk
 
-all: core tasks loader texthelp listhelp tools widgets shell taskmgr serial sql apps deploy-helpsrc compile-help deploy-sdk
+all: libdvx libtasks loader texthelp listhelp tools widgets dvxshell taskmgr serial sql apps deploy-helpsrc compile-help deploy-sdk
 
-core:
-	$(MAKE) -C core
+libdvx:
+	$(MAKE) -C src/libs/kpunch/libdvx
 
-tasks:
-	$(MAKE) -C tasks
+libtasks:
+	$(MAKE) -C src/libs/kpunch/libtasks
 
-loader: core tasks
-	$(MAKE) -C loader
+loader: libdvx libtasks
+	$(MAKE) -C src/loader
 
-texthelp: core tasks
-	$(MAKE) -C texthelp
+texthelp: libdvx libtasks
+	$(MAKE) -C src/libs/kpunch/texthelp
 
-listhelp: core tasks
-	$(MAKE) -C listhelp
+listhelp: libdvx libtasks
+	$(MAKE) -C src/libs/kpunch/listhelp
 
-widgets: core tasks texthelp listhelp
-	$(MAKE) -C widgets
+widgets: libdvx libtasks texthelp listhelp
+	$(MAKE) -C src/widgets/kpunch
 
-shell: core tasks
-	$(MAKE) -C shell
+dvxshell: libdvx libtasks
+	$(MAKE) -C src/libs/kpunch/dvxshell
 
-taskmgr: shell
-	$(MAKE) -C taskmgr
+taskmgr: dvxshell
+	$(MAKE) -C src/libs/kpunch/taskmgr
 
-serial: core tasks
-	$(MAKE) -C serial
+serial: libdvx libtasks
+	$(MAKE) -C src/libs/kpunch/serial
 
-sql: core tasks
-	$(MAKE) -C sql
+sql: libdvx libtasks
+	$(MAKE) -C src/libs/kpunch/sql
 
 tools:
-	$(MAKE) -C tools
+	$(MAKE) -C src/tools
 
-apps: core tasks shell tools
-	$(MAKE) -C apps
+apps: libdvx libtasks dvxshell tools
+	$(MAKE) -C src/apps/kpunch
 
 deploy-helpsrc:
-	$(MAKE) -C tools deploy-helpsrc
+	$(MAKE) -C src/tools deploy-helpsrc
 
 HLPC = bin/host/dvxhlpc
 
-SYSTEM_DHS = core/sysdoc.dhs \
-	core/arch.dhs core/apiref.dhs \
-	tasks/libtasks.dhs shell/dvxshell.dhs sql/dvxsql.dhs \
-	texthelp/texthelp.dhs listhelp/listhelp.dhs \
-	taskmgr/taskmgr.dhs serial/serial.dhs \
-	apps/dvxbasic/basrt.dhs \
-	widgets/wgtsys.dhs
+SYSTEM_DHS = src/libs/kpunch/libdvx/sysdoc.dhs \
+	src/libs/kpunch/libdvx/arch.dhs src/libs/kpunch/libdvx/apiref.dhs \
+	src/libs/kpunch/libtasks/libtasks.dhs src/libs/kpunch/dvxshell/dvxshell.dhs src/libs/kpunch/sql/dvxsql.dhs \
+	src/libs/kpunch/texthelp/texthelp.dhs src/libs/kpunch/listhelp/listhelp.dhs \
+	src/libs/kpunch/taskmgr/taskmgr.dhs src/libs/kpunch/serial/serial.dhs \
+	src/apps/kpunch/dvxbasic/basrt.dhs \
+	src/widgets/kpunch/wgtsys.dhs
 
-BASIC_DHS = apps/dvxbasic/ideguide.dhs apps/dvxbasic/langref.dhs \
-	apps/dvxbasic/ctrlover.dhs apps/dvxbasic/form.dhs
+BASIC_DHS = src/apps/kpunch/dvxbasic/ideguide.dhs src/apps/kpunch/dvxbasic/langref.dhs \
+	src/apps/kpunch/dvxbasic/ctrlover.dhs src/apps/kpunch/dvxbasic/form.dhs
 
 compile-help:
 	@mkdir -p docs
 	$(HLPC) -o bin/apps/kpunch/dvxhelp/dvxhelp.hlp \
 		--html docs/dvx_help_viewer.html \
-		apps/dvxhelp/help.dhs
+		src/apps/kpunch/dvxhelp/help.dhs
 	$(HLPC) -o bin/apps/kpunch/progman/dvxhelp.hlp \
 		--html docs/dvx_system_reference.html \
-		-i core \
+		-i src/libs/kpunch/libdvx \
 		$(SYSTEM_DHS) \
-		$$(find widgets -name "*.dhs" ! -path "widgets/wgtsys.dhs" | sort)
+		$$(find src/widgets/kpunch -name "*.dhs" ! -path "*/wgtsys.dhs" | sort)
 	$(HLPC) -o bin/apps/kpunch/dvxbasic/dvxbasic.hlp \
 		--html docs/dvx_basic_reference.html \
 		$(BASIC_DHS) \
-		$$(find widgets -name "*.bhs" | sort)
+		$$(find src/widgets/kpunch -name "*.bhs" | sort)
 
 SDKDIR = bin/sdk
 
 deploy-sdk:
 	@echo "Building SDK..."
-	@mkdir -p $(SDKDIR)/include/core $(SDKDIR)/include/shell $(SDKDIR)/include/tasks $(SDKDIR)/include/sql
-	@mkdir -p $(SDKDIR)/samples/hello $(SDKDIR)/samples/widget
-	@# Core headers
-	@for f in core/dvxApp.h core/dvxTypes.h core/dvxWgt.h core/dvxWgtP.h \
-		core/dvxWm.h core/dvxDraw.h core/dvxVideo.h core/dvxComp.h \
-		core/dvxPrefs.h core/dvxDlg.h core/dvxRes.h core/dvxFont.h \
-		core/dvxCur.h core/dvxPal.h core/dvxPlat.h; do \
-		[ -f "$$f" ] || continue; \
-		cp "$$f" $(SDKDIR)/include/core/; \
+	@mkdir -p $(SDKDIR)/include/core $(SDKDIR)/include/shell $(SDKDIR)/include/tasks $(SDKDIR)/include/sql $(SDKDIR)/include/basic
+	@# Core headers (libdvx public API)
+	@for f in src/libs/kpunch/libdvx/dvxApp.h src/libs/kpunch/libdvx/dvxTypes.h \
+		src/libs/kpunch/libdvx/dvxWgt.h src/libs/kpunch/libdvx/dvxWgtP.h \
+		src/libs/kpunch/libdvx/dvxWm.h src/libs/kpunch/libdvx/dvxDraw.h \
+		src/libs/kpunch/libdvx/dvxVideo.h src/libs/kpunch/libdvx/dvxComp.h \
+		src/libs/kpunch/libdvx/dvxPrefs.h src/libs/kpunch/libdvx/dvxDlg.h \
+		src/libs/kpunch/libdvx/dvxRes.h src/libs/kpunch/libdvx/dvxFont.h \
+		src/libs/kpunch/libdvx/dvxCur.h src/libs/kpunch/libdvx/dvxPal.h \
+		src/libs/kpunch/libdvx/dvxMem.h src/libs/kpunch/libdvx/platform/dvxPlat.h; do \
+		[ -f "$$f" ] && cp "$$f" $(SDKDIR)/include/core/; \
 	done
 	@# Shell header
-	@cp shell/shellApp.h $(SDKDIR)/include/shell/ 2>/dev/null || true
+	@cp src/libs/kpunch/dvxshell/shellApp.h $(SDKDIR)/include/shell/
+	@cp src/libs/kpunch/dvxshell/shellInf.h $(SDKDIR)/include/shell/
 	@# Tasks header
-	@for f in tasks/taskSwch.h tasks/taskswitch.h; do \
-		[ -f "$$f" ] && cp "$$f" $(SDKDIR)/include/tasks/ && break; \
-	done
+	@cp src/libs/kpunch/libtasks/taskSwch.h $(SDKDIR)/include/tasks/
 	@# SQL header
-	@cp sql/dvxSql.h $(SDKDIR)/include/sql/ 2>/dev/null || true
-	@# Widget headers — one per widget
-	@for d in widgets/*/; do \
+	@cp src/libs/kpunch/sql/dvxSql.h $(SDKDIR)/include/sql/
+	@# Widget headers -- one subdir per widget
+	@for d in src/widgets/kpunch/*/; do \
 		for h in "$$d"*.h; do \
 			[ -f "$$h" ] || continue; \
-			base=$$(basename "$$h"); \
 			wgt=$$(basename "$$d"); \
 			mkdir -p $(SDKDIR)/include/widget/"$$wgt"; \
 			cp "$$h" $(SDKDIR)/include/widget/"$$wgt"/; \
 		done; \
 	done
 	@# BASIC include files
-	@mkdir -p $(SDKDIR)/include/basic
-	@cp sdk/include/basic/*.bas $(SDKDIR)/include/basic/ 2>/dev/null || true
-	@# Samples and readme
-	@cp -r sdk/samples $(SDKDIR)/
-	@cp sdk/readme.txt $(SDKDIR)/README.TXT
+	@cp src/include/basic/*.bas $(SDKDIR)/include/basic/
+	@# README
+	@printf '%s\n' \
+		'DVX SDK' \
+		'=======' \
+		'' \
+		'Headers for developing applications and widgets against the DVX GUI.' \
+		'' \
+		'Directory Structure' \
+		'-------------------' \
+		'' \
+		'  include/' \
+		'    core/       DVX core headers (types, drawing, windows, widgets)' \
+		'    shell/      Shell/app loading API' \
+		'    tasks/      Cooperative task switching API' \
+		'    sql/        SQLite database wrapper API' \
+		'    widget/     Per-widget public API headers' \
+		'    basic/      BASIC include files (DECLARE LIBRARY modules)' \
+		'' \
+		'Requirements' \
+		'------------' \
+		'' \
+		'  - DJGPP cross-compiler (i586-pc-msdosdjgpp-gcc)' \
+		'  - dxe3gen (included with DJGPP)' \
+		'  - DVX resource compiler (SYSTEM/DVXRES.EXE on the target,' \
+		'    or bin/host/dvxres on the host)' \
+		'  - DVX help compiler (SYSTEM/DVXHLPC.EXE on the target,' \
+		'    or bin/host/dvxhlpc on the host)' \
+		'' \
+		'For complete working examples, see the app sources under' \
+		'src/apps/kpunch/ in the DVX repository.' \
+		> $(SDKDIR)/README.TXT
 
 clean:
-	$(MAKE) -C core clean
-	$(MAKE) -C tasks clean
-	$(MAKE) -C loader clean
-	$(MAKE) -C texthelp clean
-	$(MAKE) -C listhelp clean
-	$(MAKE) -C widgets clean
-	$(MAKE) -C shell clean
-	$(MAKE) -C taskmgr clean
-	$(MAKE) -C serial clean
-	$(MAKE) -C sql clean
-	$(MAKE) -C apps clean
-	$(MAKE) -C tools clean
+	$(MAKE) -C src/libs/kpunch/libdvx clean
+	$(MAKE) -C src/libs/kpunch/libtasks clean
+	$(MAKE) -C src/loader clean
+	$(MAKE) -C src/libs/kpunch/texthelp clean
+	$(MAKE) -C src/libs/kpunch/listhelp clean
+	$(MAKE) -C src/widgets/kpunch clean
+	$(MAKE) -C src/libs/kpunch/dvxshell clean
+	$(MAKE) -C src/libs/kpunch/taskmgr clean
+	$(MAKE) -C src/libs/kpunch/serial clean
+	$(MAKE) -C src/libs/kpunch/sql clean
+	$(MAKE) -C src/apps/kpunch clean
+	$(MAKE) -C src/tools clean
 	-rmdir obj 2>/dev/null
 	-rm -rf bin/config bin/widgets bin/libs bin/sdk
 	-rm -f docs/*.html
-	-rmdir bin/apps/kpunch/cpanel bin/apps/kpunch/imgview bin/apps/kpunch/progman bin/apps/kpunch/notepad bin/apps/kpunch/clock bin/apps/kpunch/dvxdemo bin/apps/kpunch bin/apps bin 2>/dev/null
diff --git a/apps/Makefile b/apps/Makefile
deleted file mode 100644
index 1338d1a..0000000
--- a/apps/Makefile
+++ /dev/null
@@ -1,166 +0,0 @@
-# DVX Shell Applications Makefile  -- builds DXE3 modules
-
-DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
-DJGPP_LIBPATH = $(HOME)/claude/windriver/tools/lib
-CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
-DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../core -I../core/platform -I../core/thirdparty -I../widgets -I../tasks -I../core/thirdparty -I../shell
-
-OBJDIR = ../obj/apps
-BINDIR = ../bin/apps
-DVXRES = ../bin/host/dvxres
-
-# App definitions: each is a subdir with a single .c file
-APPS = progman clock dvxdemo cpanel dvxhelp
-
-BASCOMP   = ../bin/host/bascomp
-BASICAPPS = iconed notepad-bas imgview-bas helpedit resedit basicdemo
-
-.PHONY: all clean $(APPS) dvxbasic $(BASICAPPS)
-
-all: $(APPS) dvxbasic $(BASICAPPS)
-
-dvxbasic:
-	$(MAKE) -C dvxbasic
-
-cpanel: $(BINDIR)/kpunch/cpanel/cpanel.app
-imgview: $(BINDIR)/kpunch/imgview/imgview.app
-progman: $(BINDIR)/kpunch/progman/progman.app
-notepad: $(BINDIR)/kpunch/notepad/notepad.app
-clock: $(BINDIR)/kpunch/clock/clock.app
-dvxdemo: $(BINDIR)/kpunch/dvxdemo/dvxdemo.app
-dvxhelp: $(BINDIR)/kpunch/dvxhelp/dvxhelp.app
-
-$(BINDIR)/kpunch/cpanel/cpanel.app: $(OBJDIR)/cpanel.o cpanel/cpanel.res cpanel/icon32.bmp | $(BINDIR)/kpunch/cpanel
-	$(DXE3GEN) -o $@ -U $<
-	cd cpanel && ../$(DVXRES) build ../$@ cpanel.res
-
-$(BINDIR)/kpunch/imgview/imgview.app: $(OBJDIR)/imgview.o imgview/imgview.res imgview/icon32.bmp | $(BINDIR)/kpunch/imgview
-	$(DXE3GEN) -o $@ -U $<
-	cd imgview && ../$(DVXRES) build ../$@ imgview.res
-
-$(BINDIR)/kpunch/progman/progman.app: $(OBJDIR)/progman.o | $(BINDIR)/kpunch/progman
-	$(DXE3GEN) -o $@ -U $<
-
-$(BINDIR)/kpunch/notepad/notepad.app: $(OBJDIR)/notepad.o notepad/notepad.res notepad/icon32.bmp | $(BINDIR)/kpunch/notepad
-	$(DXE3GEN) -o $@ -U $<
-	cd notepad && ../$(DVXRES) build ../$@ notepad.res
-
-$(BINDIR)/kpunch/clock/clock.app: $(OBJDIR)/clock.o clock/clock.res clock/icon32.bmp | $(BINDIR)/kpunch/clock
-	$(DXE3GEN) -o $@ -U $<
-	cd clock && ../$(DVXRES) build ../$@ clock.res
-
-DVXDEMO_BMPS = logo.bmp new.bmp open.bmp sample.bmp save.bmp
-
-$(BINDIR)/kpunch/dvxdemo/dvxdemo.app: $(OBJDIR)/dvxdemo.o $(addprefix dvxdemo/,$(DVXDEMO_BMPS)) dvxdemo/dvxdemo.res dvxdemo/icon32.bmp | $(BINDIR)/kpunch/dvxdemo
-	$(DXE3GEN) -o $@ -U $<
-	cd dvxdemo && ../$(DVXRES) build ../$@ dvxdemo.res
-	cp $(addprefix dvxdemo/,$(DVXDEMO_BMPS)) $(BINDIR)/kpunch/dvxdemo/
-
-$(OBJDIR)/cpanel.o: cpanel/cpanel.c | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(OBJDIR)/imgview.o: imgview/imgview.c | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(OBJDIR)/progman.o: progman/progman.c | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(OBJDIR)/notepad.o: notepad/notepad.c | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(OBJDIR)/clock.o: clock/clock.c | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(OBJDIR)/dvxdemo.o: dvxdemo/dvxdemo.c | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(BINDIR)/kpunch/dvxhelp/dvxhelp.app: $(OBJDIR)/dvxhelp.o dvxhelp/dvxhelp.res dvxhelp/icon32.bmp | $(BINDIR)/kpunch/dvxhelp
-	$(DXE3GEN) -o $@ -U $<
-	cd dvxhelp && ../$(DVXRES) build ../$@ dvxhelp.res
-
-$(OBJDIR)/dvxhelp.o: dvxhelp/dvxhelp.c dvxhelp/hlpformat.h | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-# BASIC apps (compiled from .dbp projects via bascomp)
-iconed: $(BINDIR)/kpunch/iconed/iconed.app
-
-$(BINDIR)/kpunch/iconed/iconed.app: ../sdk/samples/basic/iconed/iconed.dbp ../sdk/samples/basic/iconed/iconed.frm ../sdk/samples/basic/iconed/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/iconed dvxbasic
-	$(BASCOMP) ../sdk/samples/basic/iconed/iconed.dbp -o $@ -release
-
-notepad-bas: $(BINDIR)/kpunch/notepad/notepad.app
-
-$(BINDIR)/kpunch/notepad/notepad.app: ../sdk/samples/basic/notepad/notepad.dbp ../sdk/samples/basic/notepad/notepad.frm ../sdk/samples/basic/notepad/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/notepad dvxbasic
-	$(BASCOMP) ../sdk/samples/basic/notepad/notepad.dbp -o $@ -release
-
-imgview-bas: $(BINDIR)/kpunch/imgview/imgview.app
-
-$(BINDIR)/kpunch/imgview/imgview.app: ../sdk/samples/basic/imgview/imgview.dbp ../sdk/samples/basic/imgview/imgview.frm ../sdk/samples/basic/imgview/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/imgview dvxbasic
-	$(BASCOMP) ../sdk/samples/basic/imgview/imgview.dbp -o $@ -release
-
-helpedit: $(BINDIR)/kpunch/dvxhelp/helpedit.app
-
-$(BINDIR)/kpunch/dvxhelp/helpedit.app: ../sdk/samples/basic/helpedit/helpedit.dbp ../sdk/samples/basic/helpedit/helpedit.frm ../sdk/samples/basic/helpedit/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/dvxhelp dvxbasic
-	$(BASCOMP) ../sdk/samples/basic/helpedit/helpedit.dbp -o $@ -release
-	$(DVXRES) add $@ helpfile text "dvxhelp.hlp"
-
-resedit: $(BINDIR)/kpunch/resedit/resedit.app
-
-$(BINDIR)/kpunch/resedit/resedit.app: ../sdk/samples/basic/resedit/resedit.dbp ../sdk/samples/basic/resedit/resedit.frm ../sdk/samples/basic/resedit/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/resedit dvxbasic
-	$(BASCOMP) ../sdk/samples/basic/resedit/resedit.dbp -o $@ -release
-
-$(BINDIR)/kpunch/resedit:
-	mkdir -p $(BINDIR)/kpunch/resedit
-
-basicdemo: $(BINDIR)/kpunch/basicdemo/basicdemo.app
-
-$(BINDIR)/kpunch/basicdemo/basicdemo.app: ../sdk/samples/basic/basicdemo/basicdemo.dbp ../sdk/samples/basic/basicdemo/basicdemo.frm ../sdk/samples/basic/basicdemo/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/basicdemo dvxbasic
-	$(BASCOMP) ../sdk/samples/basic/basicdemo/basicdemo.dbp -o $@ -release
-
-$(BINDIR)/kpunch/basicdemo:
-	mkdir -p $(BINDIR)/kpunch/basicdemo
-
-$(BINDIR)/kpunch/iconed:
-	mkdir -p $(BINDIR)/kpunch/iconed
-
-$(OBJDIR):
-	mkdir -p $(OBJDIR)
-
-$(BINDIR)/kpunch/cpanel:
-	mkdir -p $(BINDIR)/kpunch/cpanel
-
-$(BINDIR)/kpunch/imgview:
-	mkdir -p $(BINDIR)/kpunch/imgview
-
-$(BINDIR)/kpunch/progman:
-	mkdir -p $(BINDIR)/kpunch/progman
-
-$(BINDIR)/kpunch/notepad:
-	mkdir -p $(BINDIR)/kpunch/notepad
-
-$(BINDIR)/kpunch/clock:
-	mkdir -p $(BINDIR)/kpunch/clock
-
-$(BINDIR)/kpunch/dvxdemo:
-	mkdir -p $(BINDIR)/kpunch/dvxdemo
-
-$(BINDIR)/kpunch/dvxhelp:
-	mkdir -p $(BINDIR)/kpunch/dvxhelp
-
-# Dependencies
-$(OBJDIR)/imgview.o: imgview/imgview.c ../core/dvxApp.h ../core/dvxDlg.h ../core/dvxWgt.h ../core/dvxWm.h ../core/dvxVideo.h ../shell/shellApp.h
-$(OBJDIR)/cpanel.o: cpanel/cpanel.c ../core/dvxApp.h ../core/dvxDlg.h ../core/dvxPrefs.h ../core/dvxWgt.h ../core/dvxWm.h ../core/platform/dvxPlat.h ../shell/shellApp.h
-$(OBJDIR)/progman.o: progman/progman.c ../core/dvxApp.h ../core/dvxDlg.h ../core/dvxWgt.h ../core/dvxWm.h ../shell/shellApp.h ../shell/shellInf.h
-$(OBJDIR)/notepad.o: notepad/notepad.c ../core/dvxApp.h ../core/dvxDlg.h ../core/dvxWgt.h ../core/dvxWm.h ../shell/shellApp.h
-$(OBJDIR)/clock.o:   clock/clock.c ../core/dvxApp.h ../core/dvxWgt.h ../core/dvxDraw.h ../core/dvxVideo.h ../shell/shellApp.h ../tasks/taskSwch.h
-$(OBJDIR)/dvxdemo.o: dvxdemo/dvxdemo.c ../core/dvxApp.h ../core/dvxDlg.h ../core/dvxWgt.h ../core/dvxWm.h ../core/dvxVideo.h ../shell/shellApp.h
-
-clean:
-	rm -f $(OBJDIR)/cpanel.o $(OBJDIR)/imgview.o $(OBJDIR)/progman.o $(OBJDIR)/notepad.o $(OBJDIR)/clock.o $(OBJDIR)/dvxdemo.o
-	rm -f $(BINDIR)/kpunch/cpanel/cpanel.app
-	rm -f $(BINDIR)/kpunch/imgview/imgview.app
-	rm -f $(BINDIR)/kpunch/progman/progman.app
-	rm -f $(BINDIR)/kpunch/notepad/notepad.app
-	rm -f $(BINDIR)/kpunch/clock/clock.app
-	rm -f $(BINDIR)/kpunch/dvxdemo/dvxdemo.app $(addprefix $(BINDIR)/kpunch/dvxdemo/,$(DVXDEMO_BMPS))
-	$(MAKE) -C dvxbasic clean
diff --git a/config/themes/hotdog.thm b/config/themes/hotdog.thm
new file mode 100644
index 0000000..73c73cc
--- /dev/null
+++ b/config/themes/hotdog.thm
@@ -0,0 +1,25 @@
+; DVX Color Theme - Hot Dog Stand
+; The infamous Windows 3.1 color scheme.  Yellow, red, black.
+; Included here for historical authenticity and eye strain.
+
+[colors]
+desktop              = 255,255,0
+windowFace           = 255,255,0
+windowHighlight      = 255,255,255
+windowShadow         = 0,0,0
+activeTitleBg        = 255,0,0
+activeTitleFg        = 255,255,255
+inactiveTitleBg      = 255,255,255
+inactiveTitleFg      = 0,0,0
+contentBg            = 255,255,255
+contentFg            = 0,0,0
+menuBg               = 255,255,255
+menuFg               = 0,0,0
+menuHighlightBg      = 255,0,0
+menuHighlightFg      = 255,255,255
+buttonFace           = 255,255,0
+scrollbarBg          = 255,255,0
+scrollbarFg          = 0,0,0
+scrollbarTrough      = 255,255,255
+cursorColor          = 255,255,0
+cursorOutline        = 0,0,0
diff --git a/src/apps/kpunch/Makefile b/src/apps/kpunch/Makefile
new file mode 100644
index 0000000..458c106
--- /dev/null
+++ b/src/apps/kpunch/Makefile
@@ -0,0 +1,135 @@
+# DVX Shell Applications Makefile  -- builds DXE3 modules
+#
+# Source tree is now one dir per app, mirroring bin/apps/kpunch/.
+
+DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
+CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
+DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../../libs/kpunch/libdvx -I../../libs/kpunch/libdvx/platform -I../../libs/kpunch/libdvx/thirdparty -I../../widgets/kpunch -I../../libs/kpunch/libtasks -I../../libs/kpunch/dvxshell
+
+OBJDIR = ../../../obj/apps
+BINDIR = ../../../bin/apps
+DVXRES = ../../../bin/host/dvxres
+
+# C apps: one directory, one .c file each
+C_APPS = progman clock dvxdemo cpanel dvxhelp
+
+BASCOMP   = ../../../bin/host/bascomp
+# BASIC apps: each is a .dbp project in its own directory.
+# BASIC-only notepad, imgview, etc. replace the old C versions.
+BASIC_APPS = iconed notepad imgview helpedit resedit basicdemo
+
+.PHONY: all clean $(C_APPS) dvxbasic $(BASIC_APPS)
+
+all: $(C_APPS) dvxbasic $(BASIC_APPS)
+
+dvxbasic:
+	$(MAKE) -C dvxbasic
+
+cpanel:  $(BINDIR)/kpunch/cpanel/cpanel.app
+progman: $(BINDIR)/kpunch/progman/progman.app
+clock:   $(BINDIR)/kpunch/clock/clock.app
+dvxdemo: $(BINDIR)/kpunch/dvxdemo/dvxdemo.app
+dvxhelp: $(BINDIR)/kpunch/dvxhelp/dvxhelp.app
+
+$(BINDIR)/kpunch/cpanel/cpanel.app: $(OBJDIR)/cpanel.o cpanel/cpanel.res cpanel/icon32.bmp | $(BINDIR)/kpunch/cpanel
+	$(DXE3GEN) -o $@ -U $<
+	cd cpanel && ../$(DVXRES) build ../$@ cpanel.res
+
+$(BINDIR)/kpunch/progman/progman.app: $(OBJDIR)/progman.o | $(BINDIR)/kpunch/progman
+	$(DXE3GEN) -o $@ -U $<
+
+$(BINDIR)/kpunch/clock/clock.app: $(OBJDIR)/clock.o clock/clock.res clock/icon32.bmp | $(BINDIR)/kpunch/clock
+	$(DXE3GEN) -o $@ -U $<
+	cd clock && ../$(DVXRES) build ../$@ clock.res
+
+DVXDEMO_BMPS = logo.bmp new.bmp open.bmp sample.bmp save.bmp
+
+$(BINDIR)/kpunch/dvxdemo/dvxdemo.app: $(OBJDIR)/dvxdemo.o $(addprefix dvxdemo/,$(DVXDEMO_BMPS)) dvxdemo/dvxdemo.res dvxdemo/icon32.bmp | $(BINDIR)/kpunch/dvxdemo
+	$(DXE3GEN) -o $@ -U $<
+	cd dvxdemo && ../$(DVXRES) build ../$@ dvxdemo.res
+	cp $(addprefix dvxdemo/,$(DVXDEMO_BMPS)) $(BINDIR)/kpunch/dvxdemo/
+
+$(BINDIR)/kpunch/dvxhelp/dvxhelp.app: $(OBJDIR)/dvxhelp.o dvxhelp/dvxhelp.res dvxhelp/icon32.bmp | $(BINDIR)/kpunch/dvxhelp
+	$(DXE3GEN) -o $@ -U $<
+	cd dvxhelp && ../$(DVXRES) build ../$@ dvxhelp.res
+
+$(OBJDIR)/cpanel.o:  cpanel/cpanel.c   | $(OBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/progman.o: progman/progman.c | $(OBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/clock.o:   clock/clock.c     | $(OBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/dvxdemo.o: dvxdemo/dvxdemo.c | $(OBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJDIR)/dvxhelp.o: dvxhelp/dvxhelp.c dvxhelp/hlpformat.h | $(OBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+# BASIC apps (compiled from .dbp projects via bascomp). Source for each app
+# is under the app's own directory.
+iconed: $(BINDIR)/kpunch/iconed/iconed.app
+
+$(BINDIR)/kpunch/iconed/iconed.app: iconed/iconed.dbp iconed/iconed.frm iconed/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/iconed dvxbasic
+	$(BASCOMP) iconed/iconed.dbp -o $@ -release
+
+notepad: $(BINDIR)/kpunch/notepad/notepad.app
+
+$(BINDIR)/kpunch/notepad/notepad.app: notepad/notepad.dbp notepad/notepad.frm notepad/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/notepad dvxbasic
+	$(BASCOMP) notepad/notepad.dbp -o $@ -release
+
+imgview: $(BINDIR)/kpunch/imgview/imgview.app
+
+$(BINDIR)/kpunch/imgview/imgview.app: imgview/imgview.dbp imgview/imgview.frm imgview/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/imgview dvxbasic
+	$(BASCOMP) imgview/imgview.dbp -o $@ -release
+
+helpedit: $(BINDIR)/kpunch/dvxhelp/helpedit.app
+
+$(BINDIR)/kpunch/dvxhelp/helpedit.app: dvxhelp/helpedit/helpedit.dbp dvxhelp/helpedit/helpedit.frm dvxhelp/helpedit/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/dvxhelp dvxbasic
+	$(BASCOMP) dvxhelp/helpedit/helpedit.dbp -o $@ -release
+	$(DVXRES) add $@ helpfile text "dvxhelp.hlp"
+
+resedit: $(BINDIR)/kpunch/resedit/resedit.app
+
+$(BINDIR)/kpunch/resedit/resedit.app: resedit/resedit.dbp resedit/resedit.frm resedit/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/resedit dvxbasic
+	$(BASCOMP) resedit/resedit.dbp -o $@ -release
+
+basicdemo: $(BINDIR)/kpunch/basicdemo/basicdemo.app
+
+$(BINDIR)/kpunch/basicdemo/basicdemo.app: basicdemo/basicdemo.dbp basicdemo/basicdemo.frm basicdemo/ICON32.BMP $(BASCOMP) | $(BINDIR)/kpunch/basicdemo dvxbasic
+	$(BASCOMP) basicdemo/basicdemo.dbp -o $@ -release
+
+$(OBJDIR):
+	mkdir -p $(OBJDIR)
+
+$(BINDIR)/kpunch/cpanel:    ; mkdir -p $@
+$(BINDIR)/kpunch/progman:   ; mkdir -p $@
+$(BINDIR)/kpunch/clock:     ; mkdir -p $@
+$(BINDIR)/kpunch/dvxdemo:   ; mkdir -p $@
+$(BINDIR)/kpunch/dvxhelp:   ; mkdir -p $@
+$(BINDIR)/kpunch/iconed:    ; mkdir -p $@
+$(BINDIR)/kpunch/notepad:   ; mkdir -p $@
+$(BINDIR)/kpunch/imgview:   ; mkdir -p $@
+$(BINDIR)/kpunch/resedit:   ; mkdir -p $@
+$(BINDIR)/kpunch/basicdemo: ; mkdir -p $@
+
+# Header dependencies
+COMMON_H = ../../libs/kpunch/libdvx/dvxApp.h ../../libs/kpunch/libdvx/dvxDlg.h ../../libs/kpunch/libdvx/dvxWgt.h ../../libs/kpunch/libdvx/dvxWm.h ../../libs/kpunch/libdvx/dvxVideo.h ../../libs/kpunch/dvxshell/shellApp.h
+$(OBJDIR)/cpanel.o:  cpanel/cpanel.c   $(COMMON_H) ../../libs/kpunch/libdvx/dvxPrefs.h ../../libs/kpunch/libdvx/platform/dvxPlat.h
+$(OBJDIR)/progman.o: progman/progman.c $(COMMON_H) ../../libs/kpunch/dvxshell/shellInf.h
+$(OBJDIR)/clock.o:   clock/clock.c     ../../libs/kpunch/libdvx/dvxApp.h ../../libs/kpunch/libdvx/dvxWgt.h ../../libs/kpunch/libdvx/dvxDraw.h ../../libs/kpunch/libdvx/dvxVideo.h ../../libs/kpunch/dvxshell/shellApp.h ../../libs/kpunch/libtasks/taskSwch.h
+$(OBJDIR)/dvxdemo.o: dvxdemo/dvxdemo.c $(COMMON_H)
+
+clean:
+	rm -f $(OBJDIR)/*.o
+	rm -f $(BINDIR)/kpunch/cpanel/cpanel.app
+	rm -f $(BINDIR)/kpunch/progman/progman.app
+	rm -f $(BINDIR)/kpunch/clock/clock.app
+	rm -f $(BINDIR)/kpunch/dvxdemo/dvxdemo.app $(addprefix $(BINDIR)/kpunch/dvxdemo/,$(DVXDEMO_BMPS))
+	rm -f $(BINDIR)/kpunch/dvxhelp/dvxhelp.app
+	rm -f $(BINDIR)/kpunch/iconed/iconed.app
+	rm -f $(BINDIR)/kpunch/notepad/notepad.app
+	rm -f $(BINDIR)/kpunch/imgview/imgview.app
+	rm -f $(BINDIR)/kpunch/dvxhelp/helpedit.app
+	rm -f $(BINDIR)/kpunch/resedit/resedit.app
+	rm -f $(BINDIR)/kpunch/basicdemo/basicdemo.app
+	$(MAKE) -C dvxbasic clean
diff --git a/apps/README.md b/src/apps/kpunch/README.md
similarity index 100%
rename from apps/README.md
rename to src/apps/kpunch/README.md
diff --git a/sdk/samples/basic/basicdemo/ICON32.BMP b/src/apps/kpunch/basicdemo/ICON32.BMP
similarity index 100%
rename from sdk/samples/basic/basicdemo/ICON32.BMP
rename to src/apps/kpunch/basicdemo/ICON32.BMP
diff --git a/sdk/samples/basic/basicdemo/basicdemo.dbp b/src/apps/kpunch/basicdemo/basicdemo.dbp
similarity index 100%
rename from sdk/samples/basic/basicdemo/basicdemo.dbp
rename to src/apps/kpunch/basicdemo/basicdemo.dbp
diff --git a/sdk/samples/basic/basicdemo/basicdemo.frm b/src/apps/kpunch/basicdemo/basicdemo.frm
similarity index 100%
rename from sdk/samples/basic/basicdemo/basicdemo.frm
rename to src/apps/kpunch/basicdemo/basicdemo.frm
diff --git a/apps/clock/clock.c b/src/apps/kpunch/clock/clock.c
similarity index 100%
rename from apps/clock/clock.c
rename to src/apps/kpunch/clock/clock.c
diff --git a/apps/clock/clock.res b/src/apps/kpunch/clock/clock.res
similarity index 100%
rename from apps/clock/clock.res
rename to src/apps/kpunch/clock/clock.res
diff --git a/apps/clock/icon32.bmp b/src/apps/kpunch/clock/icon32.bmp
similarity index 100%
rename from apps/clock/icon32.bmp
rename to src/apps/kpunch/clock/icon32.bmp
diff --git a/apps/cpanel/cpanel.c b/src/apps/kpunch/cpanel/cpanel.c
similarity index 100%
rename from apps/cpanel/cpanel.c
rename to src/apps/kpunch/cpanel/cpanel.c
diff --git a/apps/cpanel/cpanel.res b/src/apps/kpunch/cpanel/cpanel.res
similarity index 100%
rename from apps/cpanel/cpanel.res
rename to src/apps/kpunch/cpanel/cpanel.res
diff --git a/apps/cpanel/icon32.bmp b/src/apps/kpunch/cpanel/icon32.bmp
similarity index 100%
rename from apps/cpanel/icon32.bmp
rename to src/apps/kpunch/cpanel/icon32.bmp
diff --git a/apps/dvxbasic/Makefile b/src/apps/kpunch/dvxbasic/Makefile
similarity index 78%
rename from apps/dvxbasic/Makefile
rename to src/apps/kpunch/dvxbasic/Makefile
index 6f4af44..56bf576 100644
--- a/apps/dvxbasic/Makefile
+++ b/src/apps/kpunch/dvxbasic/Makefile
@@ -12,15 +12,16 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../../core -I../../core/platform -I../../widgets -I../../shell -I../../tasks -I../../core/thirdparty -I.
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../../../libs/kpunch/libdvx -I../../../libs/kpunch/libdvx/platform -I../../../widgets/kpunch -I../../../libs/kpunch/dvxshell -I../../../libs/kpunch/libtasks -I../../../libs/kpunch/libdvx/thirdparty -I.
 
-OBJDIR  = ../../obj/dvxbasic
-LIBSDIR = ../../bin/libs
-APPDIR  = ../../bin/apps/kpunch/dvxbasic
-DVXRES  = ../../bin/host/dvxres
+OBJDIR  = ../../../../obj/dvxbasic
+LIBSDIR = ../../../../bin/libs
+APPDIR  = ../../../../bin/apps/kpunch/dvxbasic
+HOSTDIR = ../../../../bin/host
+DVXRES  = $(HOSTDIR)/dvxres
 
-# Runtime library objects (VM + values + form runtime + serialization + compiled forms)
-RT_OBJS = $(OBJDIR)/vm.o $(OBJDIR)/values.o $(OBJDIR)/formrt.o $(OBJDIR)/serialize.o $(OBJDIR)/formcfm.o
+# Runtime library objects (VM + values + form runtime + serialization)
+RT_OBJS = $(OBJDIR)/vm.o $(OBJDIR)/values.o $(OBJDIR)/formrt.o $(OBJDIR)/serialize.o
 RT_TARGETDIR = $(LIBSDIR)/kpunch/basrt
 RT_TARGET    = $(RT_TARGETDIR)/basrt.lib
 
@@ -38,33 +39,32 @@ STUB_TARGET = $(OBJDIR)/basstub.app
 
 # Native test programs (host gcc, not cross-compiled)
 HOSTCC     = gcc
-HOSTCFLAGS = -O2 -Wall -Wextra -Wno-type-limits -Wno-sign-compare -D_GNU_SOURCE -I. -I../../core -I../../core/platform -I../../core/thirdparty
-BINDIR     = ../../bin
+HOSTCFLAGS = -O2 -Wall -Wextra -Wno-type-limits -Wno-sign-compare -D_GNU_SOURCE -I. -I../../../libs/kpunch/libdvx -I../../../libs/kpunch/libdvx/platform -I../../../libs/kpunch/libdvx/thirdparty
 
-TEST_COMPILER = $(BINDIR)/test_compiler
-TEST_VM       = $(BINDIR)/test_vm
-TEST_LEX      = $(BINDIR)/test_lex
-TEST_QUICK    = $(BINDIR)/test_quick
-TEST_COMPACT  = $(BINDIR)/test_compact
+TEST_COMPILER = $(HOSTDIR)/test_compiler
+TEST_VM       = $(HOSTDIR)/test_vm
+TEST_LEX      = $(HOSTDIR)/test_lex
+TEST_QUICK    = $(HOSTDIR)/test_quick
+TEST_COMPACT  = $(HOSTDIR)/test_compact
 
-STB_DS_IMPL        = ../../core/thirdparty/stb_ds_impl.c
-TEST_COMPILER_SRCS = test_compiler.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c runtime/vm.c runtime/values.c runtime/serialize.c $(STB_DS_IMPL)
-TEST_VM_SRCS       = test_vm.c runtime/vm.c runtime/values.c runtime/serialize.c $(STB_DS_IMPL)
+STB_DS_IMPL        = ../../../libs/kpunch/libdvx/thirdparty/stb_ds_impl.c
+PLATFORM_CHDIR     = ../../../libs/kpunch/libdvx/platform/dvxPlatformChdir.c
+TEST_COMPILER_SRCS = test_compiler.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c runtime/vm.c runtime/values.c runtime/serialize.c $(PLATFORM_CHDIR) $(STB_DS_IMPL)
+TEST_VM_SRCS       = test_vm.c runtime/vm.c runtime/values.c runtime/serialize.c $(PLATFORM_CHDIR) $(STB_DS_IMPL)
 TEST_LEX_SRCS      = test_lex.c compiler/lexer.c
-TEST_QUICK_SRCS    = test_quick.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c runtime/vm.c runtime/values.c runtime/serialize.c $(STB_DS_IMPL)
-TEST_COMPACT_SRCS  = test_compact.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c compiler/strip.c compiler/compact.c runtime/vm.c runtime/values.c runtime/serialize.c $(STB_DS_IMPL)
+TEST_QUICK_SRCS    = test_quick.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c runtime/vm.c runtime/values.c runtime/serialize.c $(PLATFORM_CHDIR) $(STB_DS_IMPL)
+TEST_COMPACT_SRCS  = test_compact.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c compiler/strip.c compiler/compact.c runtime/vm.c runtime/values.c runtime/serialize.c $(PLATFORM_CHDIR) $(STB_DS_IMPL)
 
 # Command-line compiler (host tool)
-HOSTDIR        = ../../bin/host
-BASCOMP_SRCS   = stub/bascomp.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c compiler/strip.c compiler/obfuscate.c compiler/compact.c runtime/vm.c runtime/values.c runtime/serialize.c ../../core/dvxPrefs.c ../../core/dvxResource.c $(STB_DS_IMPL)
+BASCOMP_SRCS   = stub/bascomp.c compiler/lexer.c compiler/parser.c compiler/codegen.c compiler/symtab.c compiler/strip.c compiler/obfuscate.c compiler/compact.c runtime/vm.c runtime/values.c runtime/serialize.c ../../../libs/kpunch/libdvx/dvxPrefs.c ../../../libs/kpunch/libdvx/dvxResource.c $(PLATFORM_CHDIR) $(STB_DS_IMPL)
 BASCOMP_TARGET = $(HOSTDIR)/bascomp
 
 # DOS command-line compiler
 DOSCC       = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
-DOSCFLAGS   = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../../core -I../../core/platform -I../../core/thirdparty -I.
+DOSCFLAGS   = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../../../libs/kpunch/libdvx -I../../../libs/kpunch/libdvx/platform -I../../../libs/kpunch/libdvx/thirdparty -I.
 EXE2COFF    = $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/exe2coff
 CWSDSTUB    = $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/CWSDSTUB.EXE
-SYSTEMDIR   = ../../bin/system
+SYSTEMDIR   = ../../../../bin/system
 
 .PHONY: all clean tests
 
@@ -72,29 +72,29 @@ all: $(RT_TARGET) $(RT_TARGETDIR)/basrt.dep $(STUB_TARGET) $(APP_TARGET) $(BASCO
 
 tests: $(TEST_COMPILER) $(TEST_VM) $(TEST_LEX) $(TEST_QUICK) $(TEST_COMPACT)
 
-$(TEST_COMPILER): $(TEST_COMPILER_SRCS) | $(BINDIR)
+$(TEST_COMPILER): $(TEST_COMPILER_SRCS) | $(HOSTDIR)
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $(TEST_COMPILER_SRCS) -lm
 
-$(TEST_VM): $(TEST_VM_SRCS) | $(BINDIR)
+$(TEST_VM): $(TEST_VM_SRCS) | $(HOSTDIR)
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $(TEST_VM_SRCS) -lm
 
-$(TEST_LEX): $(TEST_LEX_SRCS) | $(BINDIR)
+$(TEST_LEX): $(TEST_LEX_SRCS) | $(HOSTDIR)
 	$(HOSTCC) $(HOSTCFLAGS) -w -o $@ $(TEST_LEX_SRCS) -lm
 
-$(TEST_QUICK): $(TEST_QUICK_SRCS) | $(BINDIR)
+$(TEST_QUICK): $(TEST_QUICK_SRCS) | $(HOSTDIR)
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $(TEST_QUICK_SRCS) -lm
 
-$(TEST_COMPACT): $(TEST_COMPACT_SRCS) | $(BINDIR)
+$(TEST_COMPACT): $(TEST_COMPACT_SRCS) | $(HOSTDIR)
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $(TEST_COMPACT_SRCS) -lm
 
 # Host command-line compiler (stub deployed alongside)
 $(BASCOMP_TARGET): $(BASCOMP_SRCS) $(STUB_TARGET) | $(HOSTDIR)
-	$(HOSTCC) $(HOSTCFLAGS) -DBASCOMP_STANDALONE -I../../tools -o $@ $(BASCOMP_SRCS) -lm
+	$(HOSTCC) $(HOSTCFLAGS) -DBASCOMP_STANDALONE -I../../../tools -o $@ $(BASCOMP_SRCS) -lm
 	cp $(STUB_TARGET) $(HOSTDIR)/BASSTUB.APP
 
 # DOS command-line compiler
 $(SYSTEMDIR)/BASCOMP.EXE: $(BASCOMP_SRCS) | $(SYSTEMDIR)
-	$(DOSCC) $(DOSCFLAGS) -DBASCOMP_STANDALONE -I../../tools -o $(SYSTEMDIR)/bascomp.exe $(BASCOMP_SRCS) -lm
+	$(DOSCC) $(DOSCFLAGS) -DBASCOMP_STANDALONE -I../../../tools -o $(SYSTEMDIR)/bascomp.exe $(BASCOMP_SRCS) -lm
 	$(EXE2COFF) $(SYSTEMDIR)/bascomp.exe
 	cat $(CWSDSTUB) $(SYSTEMDIR)/bascomp > $@
 	rm -f $(SYSTEMDIR)/bascomp $(SYSTEMDIR)/bascomp.exe
@@ -114,7 +114,7 @@ $(RT_TARGET): $(RT_OBJS) | $(RT_TARGETDIR)
 	$(DXE3GEN) -o $(RT_TARGETDIR)/basrt.dxe -U $(RT_OBJS)
 	mv $(RT_TARGETDIR)/basrt.dxe $@
 
-$(RT_TARGETDIR)/basrt.dep: ../../config/basrt.dep | $(RT_TARGETDIR)
+$(RT_TARGETDIR)/basrt.dep: basrt.dep | $(RT_TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 # Standalone stub DXE (embedded as resource in IDE app)
@@ -135,9 +135,6 @@ $(OBJDIR)/codegen.o: compiler/codegen.c compiler/codegen.h compiler/symtab.h com
 $(OBJDIR)/formrt.o: formrt/formrt.c formrt/formrt.h compiler/opcodes.h runtime/vm.h | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/formcfm.o: formrt/formcfm.c formrt/formcfm.h formrt/formrt.h | $(OBJDIR)
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 $(OBJDIR)/serialize.o: runtime/serialize.c runtime/serialize.h runtime/vm.h | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
@@ -150,7 +147,7 @@ $(OBJDIR)/obfuscate.o: compiler/obfuscate.c compiler/obfuscate.h runtime/vm.h ru
 $(OBJDIR)/compact.o: compiler/compact.c compiler/compact.h compiler/opcodes.h runtime/vm.h | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/basstub.o: stub/basstub.c runtime/vm.h runtime/serialize.h formrt/formrt.h formrt/formcfm.h | $(OBJDIR)
+$(OBJDIR)/basstub.o: stub/basstub.c runtime/vm.h runtime/serialize.h formrt/formrt.h | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(OBJDIR)/ideDesigner.o: ide/ideDesigner.c ide/ideDesigner.h | $(OBJDIR)
@@ -199,9 +196,6 @@ $(RT_TARGETDIR):
 $(APPDIR):
 	mkdir -p $(APPDIR)
 
-$(BINDIR):
-	mkdir -p $(BINDIR)
-
 clean:
 	rm -rf $(RT_OBJS) $(COMP_OBJS) $(IDE_OBJS) $(STUB_OBJS) $(RT_TARGET) $(APP_TARGET) $(STUB_TARGET) $(BASCOMP_TARGET) $(RT_TARGETDIR)/basrt.dep $(RT_TARGETDIR) $(OBJDIR)/basrt_init.o
-	rm -f $(TEST_COMPILER) $(TEST_VM) $(TEST_LEX) $(TEST_QUICK)
+	rm -f $(TEST_COMPILER) $(TEST_VM) $(TEST_LEX) $(TEST_QUICK) $(TEST_COMPACT)
diff --git a/apps/dvxbasic/README.md b/src/apps/kpunch/dvxbasic/README.md
similarity index 100%
rename from apps/dvxbasic/README.md
rename to src/apps/kpunch/dvxbasic/README.md
diff --git a/config/basrt.dep b/src/apps/kpunch/dvxbasic/basrt.dep
similarity index 100%
rename from config/basrt.dep
rename to src/apps/kpunch/dvxbasic/basrt.dep
diff --git a/apps/dvxbasic/basrt.dhs b/src/apps/kpunch/dvxbasic/basrt.dhs
similarity index 100%
rename from apps/dvxbasic/basrt.dhs
rename to src/apps/kpunch/dvxbasic/basrt.dhs
diff --git a/apps/dvxbasic/compiler/codegen.c b/src/apps/kpunch/dvxbasic/compiler/codegen.c
similarity index 100%
rename from apps/dvxbasic/compiler/codegen.c
rename to src/apps/kpunch/dvxbasic/compiler/codegen.c
diff --git a/apps/dvxbasic/compiler/codegen.h b/src/apps/kpunch/dvxbasic/compiler/codegen.h
similarity index 100%
rename from apps/dvxbasic/compiler/codegen.h
rename to src/apps/kpunch/dvxbasic/compiler/codegen.h
diff --git a/apps/dvxbasic/compiler/compact.c b/src/apps/kpunch/dvxbasic/compiler/compact.c
similarity index 100%
rename from apps/dvxbasic/compiler/compact.c
rename to src/apps/kpunch/dvxbasic/compiler/compact.c
diff --git a/apps/dvxbasic/compiler/compact.h b/src/apps/kpunch/dvxbasic/compiler/compact.h
similarity index 100%
rename from apps/dvxbasic/compiler/compact.h
rename to src/apps/kpunch/dvxbasic/compiler/compact.h
diff --git a/apps/dvxbasic/compiler/lexer.c b/src/apps/kpunch/dvxbasic/compiler/lexer.c
similarity index 100%
rename from apps/dvxbasic/compiler/lexer.c
rename to src/apps/kpunch/dvxbasic/compiler/lexer.c
diff --git a/apps/dvxbasic/compiler/lexer.h b/src/apps/kpunch/dvxbasic/compiler/lexer.h
similarity index 100%
rename from apps/dvxbasic/compiler/lexer.h
rename to src/apps/kpunch/dvxbasic/compiler/lexer.h
diff --git a/apps/dvxbasic/compiler/obfuscate.c b/src/apps/kpunch/dvxbasic/compiler/obfuscate.c
similarity index 98%
rename from apps/dvxbasic/compiler/obfuscate.c
rename to src/apps/kpunch/dvxbasic/compiler/obfuscate.c
index 267312e..3f8be69 100644
--- a/apps/dvxbasic/compiler/obfuscate.c
+++ b/src/apps/kpunch/dvxbasic/compiler/obfuscate.c
@@ -516,13 +516,15 @@ int32_t basStripFrmComments(const char *src, int32_t srcLen, uint8_t *outBuf, in
             continue;
         }
 
-        int32_t writeLen = contentEnd - lineStart;
+        // Strip leading whitespace -- the form parser trims per line
+        // anyway, so shipping indentation just bloats the embedded resource.
+        int32_t writeLen = contentEnd - firstNonWs;
 
         if (outLen + writeLen + 1 >= outCap) {
             break;
         }
 
-        memcpy(outBuf + outLen, src + lineStart, writeLen);
+        memcpy(outBuf + outLen, src + firstNonWs, writeLen);
         outLen += writeLen;
         outBuf[outLen++] = '\n';
     }
diff --git a/apps/dvxbasic/compiler/obfuscate.h b/src/apps/kpunch/dvxbasic/compiler/obfuscate.h
similarity index 100%
rename from apps/dvxbasic/compiler/obfuscate.h
rename to src/apps/kpunch/dvxbasic/compiler/obfuscate.h
diff --git a/apps/dvxbasic/compiler/opcodes.h b/src/apps/kpunch/dvxbasic/compiler/opcodes.h
similarity index 100%
rename from apps/dvxbasic/compiler/opcodes.h
rename to src/apps/kpunch/dvxbasic/compiler/opcodes.h
diff --git a/apps/dvxbasic/compiler/parser.c b/src/apps/kpunch/dvxbasic/compiler/parser.c
similarity index 100%
rename from apps/dvxbasic/compiler/parser.c
rename to src/apps/kpunch/dvxbasic/compiler/parser.c
diff --git a/apps/dvxbasic/compiler/parser.h b/src/apps/kpunch/dvxbasic/compiler/parser.h
similarity index 100%
rename from apps/dvxbasic/compiler/parser.h
rename to src/apps/kpunch/dvxbasic/compiler/parser.h
diff --git a/apps/dvxbasic/compiler/strip.c b/src/apps/kpunch/dvxbasic/compiler/strip.c
similarity index 100%
rename from apps/dvxbasic/compiler/strip.c
rename to src/apps/kpunch/dvxbasic/compiler/strip.c
diff --git a/apps/dvxbasic/compiler/strip.h b/src/apps/kpunch/dvxbasic/compiler/strip.h
similarity index 100%
rename from apps/dvxbasic/compiler/strip.h
rename to src/apps/kpunch/dvxbasic/compiler/strip.h
diff --git a/apps/dvxbasic/compiler/symtab.c b/src/apps/kpunch/dvxbasic/compiler/symtab.c
similarity index 100%
rename from apps/dvxbasic/compiler/symtab.c
rename to src/apps/kpunch/dvxbasic/compiler/symtab.c
diff --git a/apps/dvxbasic/compiler/symtab.h b/src/apps/kpunch/dvxbasic/compiler/symtab.h
similarity index 100%
rename from apps/dvxbasic/compiler/symtab.h
rename to src/apps/kpunch/dvxbasic/compiler/symtab.h
diff --git a/apps/dvxbasic/ctrlover.dhs b/src/apps/kpunch/dvxbasic/ctrlover.dhs
similarity index 100%
rename from apps/dvxbasic/ctrlover.dhs
rename to src/apps/kpunch/dvxbasic/ctrlover.dhs
diff --git a/apps/dvxbasic/dvxbasic.hcf b/src/apps/kpunch/dvxbasic/dvxbasic.hcf
similarity index 100%
rename from apps/dvxbasic/dvxbasic.hcf
rename to src/apps/kpunch/dvxbasic/dvxbasic.hcf
diff --git a/apps/dvxbasic/dvxbasic.res b/src/apps/kpunch/dvxbasic/dvxbasic.res
similarity index 100%
rename from apps/dvxbasic/dvxbasic.res
rename to src/apps/kpunch/dvxbasic/dvxbasic.res
diff --git a/apps/dvxbasic/form.dhs b/src/apps/kpunch/dvxbasic/form.dhs
similarity index 100%
rename from apps/dvxbasic/form.dhs
rename to src/apps/kpunch/dvxbasic/form.dhs
diff --git a/apps/dvxbasic/formrt/formrt.c b/src/apps/kpunch/dvxbasic/formrt/formrt.c
similarity index 99%
rename from apps/dvxbasic/formrt/formrt.c
rename to src/apps/kpunch/dvxbasic/formrt/formrt.c
index 06b13fc..925e13b 100644
--- a/apps/dvxbasic/formrt/formrt.c
+++ b/src/apps/kpunch/dvxbasic/formrt/formrt.c
@@ -5,7 +5,6 @@
 // registered by .wgt DXE files. No hardcoded control types.
 
 #include "formrt.h"
-#include "formcfm.h"
 #include "../compiler/opcodes.h"
 #include "dvxDlg.h"
 #include "dvxRes.h"
@@ -1204,15 +1203,19 @@ void basFormRtRegisterCfm(BasFormRtT *rt, const char *formName, const uint8_t *d
 
 
 // ============================================================
-// basFormRtLoadCfm -- load form from compiled binary via formcfm
+// basFormRtLoadCfm -- stubbed; compiled form binary format is deferred.
+// The cfmCache is never populated, so this is kept only for the call
+// site that references it.
 // ============================================================
 
 static void *basFormRtLoadCfm(BasFormRtT *rt, const uint8_t *data, int32_t dataLen) {
-    dvxLog("basFormRtLoadCfm: loading compiled form (%ld bytes)", (long)dataLen);
-    BasFormT *form = basFormLoadCompiled(rt, data, dataLen);
+    (void)rt; (void)data; (void)dataLen;
+    return NULL;
+    // Unreachable past here; left to satisfy the rest of the function body
+    // which assumed a live formcfm implementation.
+    BasFormT *form = NULL;
 
     if (!form || !form->window) {
-        dvxLog("basFormRtLoadCfm: basFormLoadCompiled failed (form=%p)", (void *)form);
         return form;
     }
 
diff --git a/apps/dvxbasic/formrt/formrt.h b/src/apps/kpunch/dvxbasic/formrt/formrt.h
similarity index 100%
rename from apps/dvxbasic/formrt/formrt.h
rename to src/apps/kpunch/dvxbasic/formrt/formrt.h
diff --git a/apps/dvxbasic/icon32.bmp b/src/apps/kpunch/dvxbasic/icon32.bmp
similarity index 100%
rename from apps/dvxbasic/icon32.bmp
rename to src/apps/kpunch/dvxbasic/icon32.bmp
diff --git a/apps/dvxbasic/ide/ideDesigner.c b/src/apps/kpunch/dvxbasic/ide/ideDesigner.c
similarity index 100%
rename from apps/dvxbasic/ide/ideDesigner.c
rename to src/apps/kpunch/dvxbasic/ide/ideDesigner.c
diff --git a/apps/dvxbasic/ide/ideDesigner.h b/src/apps/kpunch/dvxbasic/ide/ideDesigner.h
similarity index 100%
rename from apps/dvxbasic/ide/ideDesigner.h
rename to src/apps/kpunch/dvxbasic/ide/ideDesigner.h
diff --git a/apps/dvxbasic/ide/ideMain.c b/src/apps/kpunch/dvxbasic/ide/ideMain.c
similarity index 99%
rename from apps/dvxbasic/ide/ideMain.c
rename to src/apps/kpunch/dvxbasic/ide/ideMain.c
index 287451d..f10a685 100644
--- a/apps/dvxbasic/ide/ideMain.c
+++ b/src/apps/kpunch/dvxbasic/ide/ideMain.c
@@ -40,13 +40,13 @@
 #include "ideToolbox.h"
 #include "ideProperties.h"
 
+#include "../compiler/obfuscate.h"
 #include "../compiler/parser.h"
 #include "../compiler/strip.h"
 #include "../runtime/serialize.h"
 #include "../formrt/formrt.h"
-#include "../formrt/formcfm.h"
 #include "dvxRes.h"
-#include "../../sql/dvxSql.h"
+#include "../../../../libs/kpunch/sql/dvxSql.h"
 #include "../runtime/vm.h"
 #include "../runtime/values.h"
 
@@ -4225,9 +4225,19 @@ static void makeExecutable(void) {
         }
 
         int32_t frmLen = (int32_t)strlen(frmSrc);
-        char resName[16];
-        snprintf(resName, sizeof(resName), "FORM%ld", (long)formIdx);
-        dvxResAppend(outPath, resName, DVX_RES_BINARY, frmSrc, (uint32_t)frmLen);
+
+        // Strip comments and leading whitespace from embedded form text.
+        int32_t  stripCap = frmLen + 16;
+        uint8_t *stripped = (uint8_t *)malloc(stripCap);
+
+        if (stripped) {
+            int32_t strippedLen = basStripFrmComments(frmSrc, frmLen, stripped, stripCap);
+            char resName[16];
+            snprintf(resName, sizeof(resName), "FORM%ld", (long)formIdx);
+            dvxResAppend(outPath, resName, DVX_RES_BINARY, stripped, (uint32_t)strippedLen);
+            free(stripped);
+        }
+
         free(frmSrc);
         formIdx++;
     }
diff --git a/apps/dvxbasic/ide/ideMenuEditor.c b/src/apps/kpunch/dvxbasic/ide/ideMenuEditor.c
similarity index 100%
rename from apps/dvxbasic/ide/ideMenuEditor.c
rename to src/apps/kpunch/dvxbasic/ide/ideMenuEditor.c
diff --git a/apps/dvxbasic/ide/ideMenuEditor.h b/src/apps/kpunch/dvxbasic/ide/ideMenuEditor.h
similarity index 100%
rename from apps/dvxbasic/ide/ideMenuEditor.h
rename to src/apps/kpunch/dvxbasic/ide/ideMenuEditor.h
diff --git a/apps/dvxbasic/ide/ideProject.c b/src/apps/kpunch/dvxbasic/ide/ideProject.c
similarity index 99%
rename from apps/dvxbasic/ide/ideProject.c
rename to src/apps/kpunch/dvxbasic/ide/ideProject.c
index 6f0e54f..978e9be 100644
--- a/apps/dvxbasic/ide/ideProject.c
+++ b/src/apps/kpunch/dvxbasic/ide/ideProject.c
@@ -713,8 +713,8 @@ static void ppdOnBrowseIcon(WidgetT *w) {
     (void)w;
 
     FileFilterT filters[] = {
-        { "Images (*.bmp;*.png;*.jpg;*.gif)", "*.bmp;*.png;*.jpg;*.gif" },
-        { "All Files (*.*)", "*.*" }
+        { "Images (*.bmp;*.png;*.jpg;*.gif)" },
+        { "All Files (*.*)" }
     };
 
     char path[DVX_MAX_PATH];
@@ -810,8 +810,8 @@ static void ppdOnBrowseHelp(WidgetT *w) {
     (void)w;
 
     FileFilterT filters[] = {
-        { "Help Files (*.hlp)", "*.hlp" },
-        { "All Files (*.*)", "*.*" }
+        { "Help Files (*.hlp)" },
+        { "All Files (*.*)" }
     };
 
     char path[DVX_MAX_PATH];
diff --git a/apps/dvxbasic/ide/ideProject.h b/src/apps/kpunch/dvxbasic/ide/ideProject.h
similarity index 100%
rename from apps/dvxbasic/ide/ideProject.h
rename to src/apps/kpunch/dvxbasic/ide/ideProject.h
diff --git a/apps/dvxbasic/ide/ideProperties.c b/src/apps/kpunch/dvxbasic/ide/ideProperties.c
similarity index 100%
rename from apps/dvxbasic/ide/ideProperties.c
rename to src/apps/kpunch/dvxbasic/ide/ideProperties.c
diff --git a/apps/dvxbasic/ide/ideProperties.h b/src/apps/kpunch/dvxbasic/ide/ideProperties.h
similarity index 100%
rename from apps/dvxbasic/ide/ideProperties.h
rename to src/apps/kpunch/dvxbasic/ide/ideProperties.h
diff --git a/apps/dvxbasic/ide/ideToolbox.c b/src/apps/kpunch/dvxbasic/ide/ideToolbox.c
similarity index 100%
rename from apps/dvxbasic/ide/ideToolbox.c
rename to src/apps/kpunch/dvxbasic/ide/ideToolbox.c
diff --git a/apps/dvxbasic/ide/ideToolbox.h b/src/apps/kpunch/dvxbasic/ide/ideToolbox.h
similarity index 100%
rename from apps/dvxbasic/ide/ideToolbox.h
rename to src/apps/kpunch/dvxbasic/ide/ideToolbox.h
diff --git a/apps/dvxbasic/ideguide.dhs b/src/apps/kpunch/dvxbasic/ideguide.dhs
similarity index 100%
rename from apps/dvxbasic/ideguide.dhs
rename to src/apps/kpunch/dvxbasic/ideguide.dhs
diff --git a/apps/dvxbasic/langref.dhs b/src/apps/kpunch/dvxbasic/langref.dhs
similarity index 100%
rename from apps/dvxbasic/langref.dhs
rename to src/apps/kpunch/dvxbasic/langref.dhs
diff --git a/apps/dvxbasic/noicon.bmp b/src/apps/kpunch/dvxbasic/noicon.bmp
similarity index 100%
rename from apps/dvxbasic/noicon.bmp
rename to src/apps/kpunch/dvxbasic/noicon.bmp
diff --git a/apps/dvxbasic/runtime/serialize.c b/src/apps/kpunch/dvxbasic/runtime/serialize.c
similarity index 100%
rename from apps/dvxbasic/runtime/serialize.c
rename to src/apps/kpunch/dvxbasic/runtime/serialize.c
diff --git a/apps/dvxbasic/runtime/serialize.h b/src/apps/kpunch/dvxbasic/runtime/serialize.h
similarity index 100%
rename from apps/dvxbasic/runtime/serialize.h
rename to src/apps/kpunch/dvxbasic/runtime/serialize.h
diff --git a/apps/dvxbasic/runtime/values.c b/src/apps/kpunch/dvxbasic/runtime/values.c
similarity index 100%
rename from apps/dvxbasic/runtime/values.c
rename to src/apps/kpunch/dvxbasic/runtime/values.c
diff --git a/apps/dvxbasic/runtime/values.h b/src/apps/kpunch/dvxbasic/runtime/values.h
similarity index 100%
rename from apps/dvxbasic/runtime/values.h
rename to src/apps/kpunch/dvxbasic/runtime/values.h
diff --git a/apps/dvxbasic/runtime/vm.c b/src/apps/kpunch/dvxbasic/runtime/vm.c
similarity index 99%
rename from apps/dvxbasic/runtime/vm.c
rename to src/apps/kpunch/dvxbasic/runtime/vm.c
index 8492293..c938dbc 100644
--- a/apps/dvxbasic/runtime/vm.c
+++ b/src/apps/kpunch/dvxbasic/runtime/vm.c
@@ -4632,7 +4632,7 @@ static BasVmResultE execFsOp(BasVmT *vm, uint8_t op) {
             BasValueT pathStr = basValToString(pathVal);
             basValRelease(&pathVal);
 
-            if (chdir(pathStr.strVal->data) != 0) {
+            if (platformChdir(pathStr.strVal->data) != 0) {
                 basValRelease(&pathStr);
                 runtimeError(vm, 76, "Path not found");
                 return BAS_VM_FILE_ERROR;
@@ -4652,13 +4652,14 @@ static BasVmResultE execFsOp(BasVmT *vm, uint8_t op) {
             BasValueT driveStr = basValToString(driveVal);
             basValRelease(&driveVal);
 
-            // On DOS, change to the drive's root directory
+            // Drive letters are a DOS-ism; platformChdir is a no-op on
+            // platforms without them.
             if (driveStr.strVal->data[0]) {
                 char drivePath[4];
                 drivePath[0] = driveStr.strVal->data[0];
                 drivePath[1] = ':';
                 drivePath[2] = '\0';
-                chdir(drivePath);
+                platformChdir(drivePath);
             }
 
             basValRelease(&driveStr);
diff --git a/apps/dvxbasic/runtime/vm.h b/src/apps/kpunch/dvxbasic/runtime/vm.h
similarity index 100%
rename from apps/dvxbasic/runtime/vm.h
rename to src/apps/kpunch/dvxbasic/runtime/vm.h
diff --git a/apps/dvxbasic/stub/bascomp.c b/src/apps/kpunch/dvxbasic/stub/bascomp.c
similarity index 98%
rename from apps/dvxbasic/stub/bascomp.c
rename to src/apps/kpunch/dvxbasic/stub/bascomp.c
index 1878c7a..d4fefef 100644
--- a/apps/dvxbasic/stub/bascomp.c
+++ b/src/apps/kpunch/dvxbasic/stub/bascomp.c
@@ -18,10 +18,10 @@
 #include "../runtime/vm.h"
 #include "../runtime/values.h"
 #include "../runtime/serialize.h"
-#include "../../core/dvxRes.h"
-#include "../../core/dvxPrefs.h"
-#include "../../core/dvxTypes.h"
-#include "../../tools/dvxResWrite.h"
+#include "../../../../libs/kpunch/libdvx/dvxRes.h"
+#include "../../../../libs/kpunch/libdvx/dvxPrefs.h"
+#include "../../../../libs/kpunch/libdvx/dvxTypes.h"
+#include "../../../../tools/dvxResWrite.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/apps/dvxbasic/stub/basstub.c b/src/apps/kpunch/dvxbasic/stub/basstub.c
similarity index 100%
rename from apps/dvxbasic/stub/basstub.c
rename to src/apps/kpunch/dvxbasic/stub/basstub.c
diff --git a/apps/dvxbasic/tb_code.bmp b/src/apps/kpunch/dvxbasic/tb_code.bmp
similarity index 100%
rename from apps/dvxbasic/tb_code.bmp
rename to src/apps/kpunch/dvxbasic/tb_code.bmp
diff --git a/apps/dvxbasic/tb_debug.bmp b/src/apps/kpunch/dvxbasic/tb_debug.bmp
similarity index 100%
rename from apps/dvxbasic/tb_debug.bmp
rename to src/apps/kpunch/dvxbasic/tb_debug.bmp
diff --git a/apps/dvxbasic/tb_design.bmp b/src/apps/kpunch/dvxbasic/tb_design.bmp
similarity index 100%
rename from apps/dvxbasic/tb_design.bmp
rename to src/apps/kpunch/dvxbasic/tb_design.bmp
diff --git a/apps/dvxbasic/tb_open.bmp b/src/apps/kpunch/dvxbasic/tb_open.bmp
similarity index 100%
rename from apps/dvxbasic/tb_open.bmp
rename to src/apps/kpunch/dvxbasic/tb_open.bmp
diff --git a/apps/dvxbasic/tb_run.bmp b/src/apps/kpunch/dvxbasic/tb_run.bmp
similarity index 100%
rename from apps/dvxbasic/tb_run.bmp
rename to src/apps/kpunch/dvxbasic/tb_run.bmp
diff --git a/apps/dvxbasic/tb_runtocur.bmp b/src/apps/kpunch/dvxbasic/tb_runtocur.bmp
similarity index 100%
rename from apps/dvxbasic/tb_runtocur.bmp
rename to src/apps/kpunch/dvxbasic/tb_runtocur.bmp
diff --git a/apps/dvxbasic/tb_save.bmp b/src/apps/kpunch/dvxbasic/tb_save.bmp
similarity index 100%
rename from apps/dvxbasic/tb_save.bmp
rename to src/apps/kpunch/dvxbasic/tb_save.bmp
diff --git a/apps/dvxbasic/tb_stepinto.bmp b/src/apps/kpunch/dvxbasic/tb_stepinto.bmp
similarity index 100%
rename from apps/dvxbasic/tb_stepinto.bmp
rename to src/apps/kpunch/dvxbasic/tb_stepinto.bmp
diff --git a/apps/dvxbasic/tb_stepout.bmp b/src/apps/kpunch/dvxbasic/tb_stepout.bmp
similarity index 100%
rename from apps/dvxbasic/tb_stepout.bmp
rename to src/apps/kpunch/dvxbasic/tb_stepout.bmp
diff --git a/apps/dvxbasic/tb_stepover.bmp b/src/apps/kpunch/dvxbasic/tb_stepover.bmp
similarity index 100%
rename from apps/dvxbasic/tb_stepover.bmp
rename to src/apps/kpunch/dvxbasic/tb_stepover.bmp
diff --git a/apps/dvxbasic/tb_stop.bmp b/src/apps/kpunch/dvxbasic/tb_stop.bmp
similarity index 100%
rename from apps/dvxbasic/tb_stop.bmp
rename to src/apps/kpunch/dvxbasic/tb_stop.bmp
diff --git a/apps/dvxbasic/test_compact.c b/src/apps/kpunch/dvxbasic/test_compact.c
similarity index 100%
rename from apps/dvxbasic/test_compact.c
rename to src/apps/kpunch/dvxbasic/test_compact.c
diff --git a/apps/dvxbasic/test_compiler.c b/src/apps/kpunch/dvxbasic/test_compiler.c
similarity index 100%
rename from apps/dvxbasic/test_compiler.c
rename to src/apps/kpunch/dvxbasic/test_compiler.c
diff --git a/apps/dvxbasic/test_lex.c b/src/apps/kpunch/dvxbasic/test_lex.c
similarity index 100%
rename from apps/dvxbasic/test_lex.c
rename to src/apps/kpunch/dvxbasic/test_lex.c
diff --git a/apps/dvxbasic/test_quick.c b/src/apps/kpunch/dvxbasic/test_quick.c
similarity index 100%
rename from apps/dvxbasic/test_quick.c
rename to src/apps/kpunch/dvxbasic/test_quick.c
diff --git a/apps/dvxbasic/test_vm.c b/src/apps/kpunch/dvxbasic/test_vm.c
similarity index 100%
rename from apps/dvxbasic/test_vm.c
rename to src/apps/kpunch/dvxbasic/test_vm.c
diff --git a/apps/dvxdemo/dvxdemo.c b/src/apps/kpunch/dvxdemo/dvxdemo.c
similarity index 100%
rename from apps/dvxdemo/dvxdemo.c
rename to src/apps/kpunch/dvxdemo/dvxdemo.c
diff --git a/apps/dvxdemo/dvxdemo.res b/src/apps/kpunch/dvxdemo/dvxdemo.res
similarity index 100%
rename from apps/dvxdemo/dvxdemo.res
rename to src/apps/kpunch/dvxdemo/dvxdemo.res
diff --git a/apps/dvxdemo/icon32.bmp b/src/apps/kpunch/dvxdemo/icon32.bmp
similarity index 100%
rename from apps/dvxdemo/icon32.bmp
rename to src/apps/kpunch/dvxdemo/icon32.bmp
diff --git a/apps/dvxdemo/logo.bmp b/src/apps/kpunch/dvxdemo/logo.bmp
similarity index 100%
rename from apps/dvxdemo/logo.bmp
rename to src/apps/kpunch/dvxdemo/logo.bmp
diff --git a/apps/dvxdemo/new.bmp b/src/apps/kpunch/dvxdemo/new.bmp
similarity index 100%
rename from apps/dvxdemo/new.bmp
rename to src/apps/kpunch/dvxdemo/new.bmp
diff --git a/apps/dvxdemo/open.bmp b/src/apps/kpunch/dvxdemo/open.bmp
similarity index 100%
rename from apps/dvxdemo/open.bmp
rename to src/apps/kpunch/dvxdemo/open.bmp
diff --git a/apps/dvxdemo/sample.bmp b/src/apps/kpunch/dvxdemo/sample.bmp
similarity index 100%
rename from apps/dvxdemo/sample.bmp
rename to src/apps/kpunch/dvxdemo/sample.bmp
diff --git a/apps/dvxdemo/save.bmp b/src/apps/kpunch/dvxdemo/save.bmp
similarity index 100%
rename from apps/dvxdemo/save.bmp
rename to src/apps/kpunch/dvxdemo/save.bmp
diff --git a/apps/dvxhelp/dvxhelp.c b/src/apps/kpunch/dvxhelp/dvxhelp.c
similarity index 100%
rename from apps/dvxhelp/dvxhelp.c
rename to src/apps/kpunch/dvxhelp/dvxhelp.c
diff --git a/apps/dvxhelp/dvxhelp.res b/src/apps/kpunch/dvxhelp/dvxhelp.res
similarity index 100%
rename from apps/dvxhelp/dvxhelp.res
rename to src/apps/kpunch/dvxhelp/dvxhelp.res
diff --git a/apps/dvxhelp/help.dhs b/src/apps/kpunch/dvxhelp/help.dhs
similarity index 100%
rename from apps/dvxhelp/help.dhs
rename to src/apps/kpunch/dvxhelp/help.dhs
diff --git a/sdk/samples/basic/helpedit/ICON32.BMP b/src/apps/kpunch/dvxhelp/helpedit/ICON32.BMP
similarity index 100%
rename from sdk/samples/basic/helpedit/ICON32.BMP
rename to src/apps/kpunch/dvxhelp/helpedit/ICON32.BMP
diff --git a/sdk/samples/basic/helpedit/helpedit.dbp b/src/apps/kpunch/dvxhelp/helpedit/helpedit.dbp
similarity index 72%
rename from sdk/samples/basic/helpedit/helpedit.dbp
rename to src/apps/kpunch/dvxhelp/helpedit/helpedit.dbp
index 50a088b..ba8e829 100644
--- a/sdk/samples/basic/helpedit/helpedit.dbp
+++ b/src/apps/kpunch/dvxhelp/helpedit/helpedit.dbp
@@ -5,8 +5,8 @@ Description = DVX Help source editor with syntax highlighting and preview
 Icon = ICON32.BMP
 
 [Modules]
-File0 = ../../../include/basic/commdlg.bas
-File1 = ../../../include/basic/help.bas
+File0 = ../../../../include/basic/commdlg.bas
+File1 = ../../../../include/basic/help.bas
 Count = 2
 
 [Forms]
diff --git a/sdk/samples/basic/helpedit/helpedit.frm b/src/apps/kpunch/dvxhelp/helpedit/helpedit.frm
similarity index 100%
rename from sdk/samples/basic/helpedit/helpedit.frm
rename to src/apps/kpunch/dvxhelp/helpedit/helpedit.frm
diff --git a/apps/dvxhelp/hlpformat.h b/src/apps/kpunch/dvxhelp/hlpformat.h
similarity index 100%
rename from apps/dvxhelp/hlpformat.h
rename to src/apps/kpunch/dvxhelp/hlpformat.h
diff --git a/apps/dvxhelp/icon32.bmp b/src/apps/kpunch/dvxhelp/icon32.bmp
similarity index 100%
rename from apps/dvxhelp/icon32.bmp
rename to src/apps/kpunch/dvxhelp/icon32.bmp
diff --git a/apps/dvxhelp/sample.dhs b/src/apps/kpunch/dvxhelp/sample.dhs
similarity index 100%
rename from apps/dvxhelp/sample.dhs
rename to src/apps/kpunch/dvxhelp/sample.dhs
diff --git a/sdk/samples/basic/iconed/ICON32.BMP b/src/apps/kpunch/iconed/ICON32.BMP
similarity index 100%
rename from sdk/samples/basic/iconed/ICON32.BMP
rename to src/apps/kpunch/iconed/ICON32.BMP
diff --git a/sdk/samples/basic/iconed/iconed.dbp b/src/apps/kpunch/iconed/iconed.dbp
similarity index 100%
rename from sdk/samples/basic/iconed/iconed.dbp
rename to src/apps/kpunch/iconed/iconed.dbp
diff --git a/sdk/samples/basic/iconed/iconed.frm b/src/apps/kpunch/iconed/iconed.frm
similarity index 100%
rename from sdk/samples/basic/iconed/iconed.frm
rename to src/apps/kpunch/iconed/iconed.frm
diff --git a/sdk/samples/basic/imgview/ICON32.BMP b/src/apps/kpunch/imgview/ICON32.BMP
similarity index 100%
rename from sdk/samples/basic/imgview/ICON32.BMP
rename to src/apps/kpunch/imgview/ICON32.BMP
diff --git a/sdk/samples/basic/imgview/imgview.dbp b/src/apps/kpunch/imgview/imgview.dbp
similarity index 100%
rename from sdk/samples/basic/imgview/imgview.dbp
rename to src/apps/kpunch/imgview/imgview.dbp
diff --git a/sdk/samples/basic/imgview/imgview.frm b/src/apps/kpunch/imgview/imgview.frm
similarity index 100%
rename from sdk/samples/basic/imgview/imgview.frm
rename to src/apps/kpunch/imgview/imgview.frm
diff --git a/sdk/samples/basic/notepad/ICON32.BMP b/src/apps/kpunch/notepad/ICON32.BMP
similarity index 100%
rename from sdk/samples/basic/notepad/ICON32.BMP
rename to src/apps/kpunch/notepad/ICON32.BMP
diff --git a/sdk/samples/basic/notepad/notepad.dbp b/src/apps/kpunch/notepad/notepad.dbp
similarity index 100%
rename from sdk/samples/basic/notepad/notepad.dbp
rename to src/apps/kpunch/notepad/notepad.dbp
diff --git a/sdk/samples/basic/notepad/notepad.frm b/src/apps/kpunch/notepad/notepad.frm
similarity index 100%
rename from sdk/samples/basic/notepad/notepad.frm
rename to src/apps/kpunch/notepad/notepad.frm
diff --git a/apps/progman/dvxhelp.hcf b/src/apps/kpunch/progman/dvxhelp.hcf
similarity index 100%
rename from apps/progman/dvxhelp.hcf
rename to src/apps/kpunch/progman/dvxhelp.hcf
diff --git a/apps/progman/progman.c b/src/apps/kpunch/progman/progman.c
similarity index 100%
rename from apps/progman/progman.c
rename to src/apps/kpunch/progman/progman.c
diff --git a/sdk/samples/basic/resedit/ICON32.BMP b/src/apps/kpunch/resedit/ICON32.BMP
similarity index 100%
rename from sdk/samples/basic/resedit/ICON32.BMP
rename to src/apps/kpunch/resedit/ICON32.BMP
diff --git a/sdk/samples/basic/resedit/resedit.dbp b/src/apps/kpunch/resedit/resedit.dbp
similarity index 100%
rename from sdk/samples/basic/resedit/resedit.dbp
rename to src/apps/kpunch/resedit/resedit.dbp
diff --git a/sdk/samples/basic/resedit/resedit.frm b/src/apps/kpunch/resedit/resedit.frm
similarity index 100%
rename from sdk/samples/basic/resedit/resedit.frm
rename to src/apps/kpunch/resedit/resedit.frm
diff --git a/sdk/include/basic/comm.bas b/src/include/basic/comm.bas
similarity index 100%
rename from sdk/include/basic/comm.bas
rename to src/include/basic/comm.bas
diff --git a/sdk/include/basic/commdlg.bas b/src/include/basic/commdlg.bas
similarity index 100%
rename from sdk/include/basic/commdlg.bas
rename to src/include/basic/commdlg.bas
diff --git a/sdk/include/basic/help.bas b/src/include/basic/help.bas
similarity index 100%
rename from sdk/include/basic/help.bas
rename to src/include/basic/help.bas
diff --git a/sdk/include/basic/resource.bas b/src/include/basic/resource.bas
similarity index 100%
rename from sdk/include/basic/resource.bas
rename to src/include/basic/resource.bas
diff --git a/sdk/include/basic/sql.bas b/src/include/basic/sql.bas
similarity index 100%
rename from sdk/include/basic/sql.bas
rename to src/include/basic/sql.bas
diff --git a/shell/Makefile b/src/libs/kpunch/dvxshell/Makefile
similarity index 68%
rename from shell/Makefile
rename to src/libs/kpunch/dvxshell/Makefile
index c3cf63f..a8909d7 100644
--- a/shell/Makefile
+++ b/src/libs/kpunch/dvxshell/Makefile
@@ -5,13 +5,13 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../core -I../core/platform -I../widgets -I../tasks -I../core/thirdparty
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../libdvx -I../libdvx/platform -I../../../widgets/kpunch -I../libtasks -I../libdvx/thirdparty
 
-OBJDIR    = ../obj/shell
-LIBSDIR   = ../bin/libs
-CONFIGDIR = ../bin/config
-THEMEDIR  = ../bin/config/themes
-WPAPERDIR = ../bin/config/wpaper
+OBJDIR    = ../../../../obj/shell
+LIBSDIR   = ../../../../bin/libs
+CONFIGDIR = ../../../../bin/config
+THEMEDIR  = ../../../../bin/config/themes
+WPAPERDIR = ../../../../bin/config/wpaper
 
 SRCS   = shellMain.c shellApp.c shellInfo.c
 OBJS   = $(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
@@ -20,19 +20,19 @@ TARGET    = $(TARGETDIR)/dvxshell.lib
 
 .PHONY: all clean
 
-THEMES = $(THEMEDIR)/geos.thm $(THEMEDIR)/win31.thm $(THEMEDIR)/cde.thm
+THEMES = $(THEMEDIR)/geos.thm $(THEMEDIR)/win31.thm $(THEMEDIR)/cde.thm $(THEMEDIR)/hotdog.thm
 WPAPERS = $(WPAPERDIR)/blueglow.jpg $(WPAPERDIR)/swoop.jpg $(WPAPERDIR)/triangle.jpg
 
-all: $(TARGET) $(TARGETDIR)/dvxshell.dep $(CONFIGDIR)/dvx.ini $(THEMES) $(WPAPERS)
+all: $(TARGET) $(TARGETDIR)/dvxshell.dep $(CONFIGDIR)/DVX.INI $(THEMES) $(WPAPERS)
 
-$(TARGETDIR)/dvxshell.dep: ../config/dvxshell.dep | $(TARGETDIR)
+$(TARGETDIR)/dvxshell.dep: dvxshell.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(TARGET): $(OBJS) | $(TARGETDIR)
 	$(DXE3GEN) -o $(TARGETDIR)/dvxshell.dxe -U $(OBJS)
 	mv $(TARGETDIR)/dvxshell.dxe $@
 
-$(CONFIGDIR)/dvx.ini: ../config/dvx.ini | $(CONFIGDIR)
+$(CONFIGDIR)/DVX.INI: ../../../../config/dvx.ini | $(CONFIGDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(OBJDIR)/%.o: %.c | $(OBJDIR)
@@ -53,17 +53,17 @@ $(CONFIGDIR):
 $(THEMEDIR):
 	mkdir -p $(THEMEDIR)
 
-$(THEMEDIR)/%.thm: ../config/themes/%.thm | $(THEMEDIR)
+$(THEMEDIR)/%.thm: ../../../../config/themes/%.thm | $(THEMEDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(WPAPERDIR):
 	mkdir -p $(WPAPERDIR)
 
-$(WPAPERDIR)/%.jpg: ../config/wpaper/%.jpg | $(WPAPERDIR)
+$(WPAPERDIR)/%.jpg: ../../../../config/wpaper/%.jpg | $(WPAPERDIR)
 	cp $< $@
 
 # Dependencies
-SHELL_DEPS = shellApp.h ../core/dvxWgt.h ../core/dvxApp.h ../core/dvxTypes.h ../core/platform/dvxPlat.h
+SHELL_DEPS = shellApp.h ../libdvx/dvxWgt.h ../libdvx/dvxApp.h ../libdvx/dvxTypes.h ../libdvx/platform/dvxPlat.h
 $(OBJDIR)/shellMain.o:    shellMain.c $(SHELL_DEPS)
 $(OBJDIR)/shellApp.o:     shellApp.c $(SHELL_DEPS)
 $(OBJDIR)/shellInfo.o:    shellInfo.c shellInf.h $(SHELL_DEPS)
diff --git a/shell/README.md b/src/libs/kpunch/dvxshell/README.md
similarity index 100%
rename from shell/README.md
rename to src/libs/kpunch/dvxshell/README.md
diff --git a/config/dvxshell.dep b/src/libs/kpunch/dvxshell/dvxshell.dep
similarity index 100%
rename from config/dvxshell.dep
rename to src/libs/kpunch/dvxshell/dvxshell.dep
diff --git a/shell/dvxshell.dhs b/src/libs/kpunch/dvxshell/dvxshell.dhs
similarity index 100%
rename from shell/dvxshell.dhs
rename to src/libs/kpunch/dvxshell/dvxshell.dhs
diff --git a/shell/shellApp.c b/src/libs/kpunch/dvxshell/shellApp.c
similarity index 100%
rename from shell/shellApp.c
rename to src/libs/kpunch/dvxshell/shellApp.c
diff --git a/shell/shellApp.h b/src/libs/kpunch/dvxshell/shellApp.h
similarity index 100%
rename from shell/shellApp.h
rename to src/libs/kpunch/dvxshell/shellApp.h
diff --git a/shell/shellInf.h b/src/libs/kpunch/dvxshell/shellInf.h
similarity index 100%
rename from shell/shellInf.h
rename to src/libs/kpunch/dvxshell/shellInf.h
diff --git a/shell/shellInfo.c b/src/libs/kpunch/dvxshell/shellInfo.c
similarity index 100%
rename from shell/shellInfo.c
rename to src/libs/kpunch/dvxshell/shellInfo.c
diff --git a/shell/shellMain.c b/src/libs/kpunch/dvxshell/shellMain.c
similarity index 100%
rename from shell/shellMain.c
rename to src/libs/kpunch/dvxshell/shellMain.c
diff --git a/core/Makefile b/src/libs/kpunch/libdvx/Makefile
similarity index 94%
rename from core/Makefile
rename to src/libs/kpunch/libdvx/Makefile
index d6c1b21..bf0d78c 100644
--- a/core/Makefile
+++ b/src/libs/kpunch/libdvx/Makefile
@@ -7,10 +7,10 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I. -Iplatform -I../tasks -Ithirdparty
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I. -Iplatform -I../libtasks -Ithirdparty
 
-OBJDIR  = ../obj/core
-LIBSDIR = ../bin/libs
+OBJDIR  = ../../../../obj/core
+LIBSDIR = ../../../../bin/libs
 
 # Core sources
 SRCS = dvxVideo.c dvxDraw.c dvxComp.c dvxWm.c dvxImage.c dvxImageWrite.c \
@@ -26,7 +26,7 @@ TARGET    = $(TARGETDIR)/libdvx.lib
 
 all: $(TARGET) $(TARGETDIR)/libdvx.dep
 
-$(TARGETDIR)/libdvx.dep: ../config/libdvx.dep | $(TARGETDIR)
+$(TARGETDIR)/libdvx.dep: libdvx.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(TARGET): $(OBJS) | $(TARGETDIR)
diff --git a/core/README.md b/src/libs/kpunch/libdvx/README.md
similarity index 100%
rename from core/README.md
rename to src/libs/kpunch/libdvx/README.md
diff --git a/core/apiref.dhs b/src/libs/kpunch/libdvx/apiref.dhs
similarity index 100%
rename from core/apiref.dhs
rename to src/libs/kpunch/libdvx/apiref.dhs
diff --git a/core/arch.dhs b/src/libs/kpunch/libdvx/arch.dhs
similarity index 100%
rename from core/arch.dhs
rename to src/libs/kpunch/libdvx/arch.dhs
diff --git a/core/dvxApp.c b/src/libs/kpunch/libdvx/dvxApp.c
similarity index 99%
rename from core/dvxApp.c
rename to src/libs/kpunch/libdvx/dvxApp.c
index 720f6fe..1a73f1f 100644
--- a/core/dvxApp.c
+++ b/src/libs/kpunch/libdvx/dvxApp.c
@@ -33,7 +33,7 @@
 #include "dvxDlg.h"
 #include "dvxWgt.h"
 #include "dvxWgtP.h"
-#include "../widgets/timer/timer.h"
+#include "../../../widgets/kpunch/timer/timer.h"
 #include "dvxFont.h"
 #include "dvxCur.h"
 
diff --git a/core/dvxApp.h b/src/libs/kpunch/libdvx/dvxApp.h
similarity index 100%
rename from core/dvxApp.h
rename to src/libs/kpunch/libdvx/dvxApp.h
diff --git a/core/dvxComp.c b/src/libs/kpunch/libdvx/dvxComp.c
similarity index 100%
rename from core/dvxComp.c
rename to src/libs/kpunch/libdvx/dvxComp.c
diff --git a/core/dvxComp.h b/src/libs/kpunch/libdvx/dvxComp.h
similarity index 100%
rename from core/dvxComp.h
rename to src/libs/kpunch/libdvx/dvxComp.h
diff --git a/core/dvxCur.h b/src/libs/kpunch/libdvx/dvxCur.h
similarity index 100%
rename from core/dvxCur.h
rename to src/libs/kpunch/libdvx/dvxCur.h
diff --git a/core/dvxDialog.c b/src/libs/kpunch/libdvx/dvxDialog.c
similarity index 99%
rename from core/dvxDialog.c
rename to src/libs/kpunch/libdvx/dvxDialog.c
index 9d8a4a1..830598c 100644
--- a/core/dvxDialog.c
+++ b/src/libs/kpunch/libdvx/dvxDialog.c
@@ -24,14 +24,14 @@
 #include "dvxPlat.h"
 #include "dvxWgt.h"
 #include "dvxWgtP.h"
-#include "../widgets/box/box.h"
-#include "../widgets/button/button.h"
-#include "../widgets/dropdown/dropdown.h"
-#include "../widgets/label/label.h"
-#include "../widgets/listBox/listBox.h"
-#include "../widgets/spacer/spacer.h"
-#include "../widgets/spinner/spinner.h"
-#include "../widgets/textInput/textInpt.h"
+#include "../../../widgets/kpunch/box/box.h"
+#include "../../../widgets/kpunch/button/button.h"
+#include "../../../widgets/kpunch/dropdown/dropdown.h"
+#include "../../../widgets/kpunch/label/label.h"
+#include "../../../widgets/kpunch/listBox/listBox.h"
+#include "../../../widgets/kpunch/spacer/spacer.h"
+#include "../../../widgets/kpunch/spinner/spinner.h"
+#include "../../../widgets/kpunch/textInput/textInpt.h"
 
 #include <ctype.h>
 #include <dirent.h>
diff --git a/core/dvxDlg.h b/src/libs/kpunch/libdvx/dvxDlg.h
similarity index 100%
rename from core/dvxDlg.h
rename to src/libs/kpunch/libdvx/dvxDlg.h
diff --git a/core/dvxDraw.c b/src/libs/kpunch/libdvx/dvxDraw.c
similarity index 100%
rename from core/dvxDraw.c
rename to src/libs/kpunch/libdvx/dvxDraw.c
diff --git a/core/dvxDraw.h b/src/libs/kpunch/libdvx/dvxDraw.h
similarity index 100%
rename from core/dvxDraw.h
rename to src/libs/kpunch/libdvx/dvxDraw.h
diff --git a/core/dvxFont.h b/src/libs/kpunch/libdvx/dvxFont.h
similarity index 100%
rename from core/dvxFont.h
rename to src/libs/kpunch/libdvx/dvxFont.h
diff --git a/core/dvxImage.c b/src/libs/kpunch/libdvx/dvxImage.c
similarity index 100%
rename from core/dvxImage.c
rename to src/libs/kpunch/libdvx/dvxImage.c
diff --git a/core/dvxImageWrite.c b/src/libs/kpunch/libdvx/dvxImageWrite.c
similarity index 100%
rename from core/dvxImageWrite.c
rename to src/libs/kpunch/libdvx/dvxImageWrite.c
diff --git a/core/dvxMem.h b/src/libs/kpunch/libdvx/dvxMem.h
similarity index 100%
rename from core/dvxMem.h
rename to src/libs/kpunch/libdvx/dvxMem.h
diff --git a/core/dvxPal.h b/src/libs/kpunch/libdvx/dvxPal.h
similarity index 100%
rename from core/dvxPal.h
rename to src/libs/kpunch/libdvx/dvxPal.h
diff --git a/core/dvxPrefs.c b/src/libs/kpunch/libdvx/dvxPrefs.c
similarity index 100%
rename from core/dvxPrefs.c
rename to src/libs/kpunch/libdvx/dvxPrefs.c
diff --git a/core/dvxPrefs.h b/src/libs/kpunch/libdvx/dvxPrefs.h
similarity index 100%
rename from core/dvxPrefs.h
rename to src/libs/kpunch/libdvx/dvxPrefs.h
diff --git a/core/dvxRes.h b/src/libs/kpunch/libdvx/dvxRes.h
similarity index 100%
rename from core/dvxRes.h
rename to src/libs/kpunch/libdvx/dvxRes.h
diff --git a/core/dvxResource.c b/src/libs/kpunch/libdvx/dvxResource.c
similarity index 99%
rename from core/dvxResource.c
rename to src/libs/kpunch/libdvx/dvxResource.c
index f93c846..65d6884 100644
--- a/core/dvxResource.c
+++ b/src/libs/kpunch/libdvx/dvxResource.c
@@ -4,7 +4,7 @@
 // block is located by reading the footer at the end of the file.
 
 #include "dvxRes.h"
-#include "../tools/dvxResWrite.h"
+#include "../../../tools/dvxResWrite.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/core/dvxTypes.h b/src/libs/kpunch/libdvx/dvxTypes.h
similarity index 100%
rename from core/dvxTypes.h
rename to src/libs/kpunch/libdvx/dvxTypes.h
diff --git a/core/dvxVideo.c b/src/libs/kpunch/libdvx/dvxVideo.c
similarity index 100%
rename from core/dvxVideo.c
rename to src/libs/kpunch/libdvx/dvxVideo.c
diff --git a/core/dvxVideo.h b/src/libs/kpunch/libdvx/dvxVideo.h
similarity index 100%
rename from core/dvxVideo.h
rename to src/libs/kpunch/libdvx/dvxVideo.h
diff --git a/core/dvxWgt.h b/src/libs/kpunch/libdvx/dvxWgt.h
similarity index 100%
rename from core/dvxWgt.h
rename to src/libs/kpunch/libdvx/dvxWgt.h
diff --git a/core/dvxWgtP.h b/src/libs/kpunch/libdvx/dvxWgtP.h
similarity index 100%
rename from core/dvxWgtP.h
rename to src/libs/kpunch/libdvx/dvxWgtP.h
diff --git a/core/dvxWm.c b/src/libs/kpunch/libdvx/dvxWm.c
similarity index 100%
rename from core/dvxWm.c
rename to src/libs/kpunch/libdvx/dvxWm.c
diff --git a/core/dvxWm.h b/src/libs/kpunch/libdvx/dvxWm.h
similarity index 100%
rename from core/dvxWm.h
rename to src/libs/kpunch/libdvx/dvxWm.h
diff --git a/core/help.png b/src/libs/kpunch/libdvx/help.png
similarity index 100%
rename from core/help.png
rename to src/libs/kpunch/libdvx/help.png
diff --git a/config/libdvx.dep b/src/libs/kpunch/libdvx/libdvx.dep
similarity index 100%
rename from config/libdvx.dep
rename to src/libs/kpunch/libdvx/libdvx.dep
diff --git a/core/platform/dvxPlat.h b/src/libs/kpunch/libdvx/platform/dvxPlat.h
similarity index 98%
rename from core/platform/dvxPlat.h
rename to src/libs/kpunch/libdvx/platform/dvxPlat.h
index 0ec6712..5128c0e 100644
--- a/core/platform/dvxPlat.h
+++ b/src/libs/kpunch/libdvx/platform/dvxPlat.h
@@ -258,8 +258,9 @@ int32_t platformMkdirRecursive(const char *path);
 
 // Change the working directory, including drive letter on DOS.  Standard
 // chdir() does not switch drives under DJGPP; this wrapper calls setdisk()
-// first when the path contains a drive prefix (e.g. "A:\DVX").
-void platformChdir(const char *path);
+// first when the path contains a drive prefix (e.g. "A:\DVX").  Returns
+// 0 on success, -1 on failure (path not found etc.).
+int32_t platformChdir(const char *path);
 
 // Free the backbuffer and palette without restoring text mode.  Used
 // when switching between graphics modes live.
diff --git a/src/libs/kpunch/libdvx/platform/dvxPlatformChdir.c b/src/libs/kpunch/libdvx/platform/dvxPlatformChdir.c
new file mode 100644
index 0000000..ab44490
--- /dev/null
+++ b/src/libs/kpunch/libdvx/platform/dvxPlatformChdir.c
@@ -0,0 +1,30 @@
+// dvxPlatformChdir.c  -- platformChdir implementation
+//
+// Extracted from dvxPlatformDos.c so it can be linked into builds that
+// don't want the full platform layer (the BASIC VM standalone compiler,
+// host-side test binaries).  Changes the working directory, switching
+// the active DOS drive first when the path contains a drive letter
+// (e.g. "A:\DVX").  Standard chdir() under DJGPP only changes the
+// directory on the current drive.  On non-DOS hosts drive letters are
+// meaningless, so this collapses to a plain chdir().
+
+#include "dvxPlat.h"
+
+#include <ctype.h>
+#include <unistd.h>
+
+#ifdef __DJGPP__
+#include <dir.h>
+#endif
+
+
+int32_t platformChdir(const char *path) {
+#ifdef __DJGPP__
+    if (path[0] && path[1] == ':') {
+        int drive = toupper((unsigned char)path[0]) - 'A';
+        setdisk(drive);
+    }
+#endif
+
+    return chdir(path) == 0 ? 0 : -1;
+}
diff --git a/core/platform/dvxPlatformDos.c b/src/libs/kpunch/libdvx/platform/dvxPlatformDos.c
similarity index 99%
rename from core/platform/dvxPlatformDos.c
rename to src/libs/kpunch/libdvx/platform/dvxPlatformDos.c
index 119daa6..ff95127 100644
--- a/core/platform/dvxPlatformDos.c
+++ b/src/libs/kpunch/libdvx/platform/dvxPlatformDos.c
@@ -525,24 +525,6 @@ char platformAltScanToChar(int32_t scancode) {
 }
 
 
-// ============================================================
-// platformChdir
-// ============================================================
-//
-// Changes the working directory, switching the active DOS drive first
-// when the path contains a drive letter (e.g. "A:\DVX").  Standard
-// chdir() under DJGPP only changes the directory on the current drive.
-
-void platformChdir(const char *path) {
-    if (path[0] && path[1] == ':') {
-        int drive = toupper((unsigned char)path[0]) - 'A';
-        setdisk(drive);
-    }
-
-    chdir(path);
-}
-
-
 // ============================================================
 // platformFlushRect
 // ============================================================
diff --git a/core/sysdoc.dhs b/src/libs/kpunch/libdvx/sysdoc.dhs
similarity index 100%
rename from core/sysdoc.dhs
rename to src/libs/kpunch/libdvx/sysdoc.dhs
diff --git a/core/thirdparty/stb_ds.h b/src/libs/kpunch/libdvx/thirdparty/stb_ds.h
similarity index 100%
rename from core/thirdparty/stb_ds.h
rename to src/libs/kpunch/libdvx/thirdparty/stb_ds.h
diff --git a/core/thirdparty/stb_ds_impl.c b/src/libs/kpunch/libdvx/thirdparty/stb_ds_impl.c
similarity index 100%
rename from core/thirdparty/stb_ds_impl.c
rename to src/libs/kpunch/libdvx/thirdparty/stb_ds_impl.c
diff --git a/core/thirdparty/stb_ds_wrap.h b/src/libs/kpunch/libdvx/thirdparty/stb_ds_wrap.h
similarity index 100%
rename from core/thirdparty/stb_ds_wrap.h
rename to src/libs/kpunch/libdvx/thirdparty/stb_ds_wrap.h
diff --git a/core/thirdparty/stb_image.h b/src/libs/kpunch/libdvx/thirdparty/stb_image.h
similarity index 100%
rename from core/thirdparty/stb_image.h
rename to src/libs/kpunch/libdvx/thirdparty/stb_image.h
diff --git a/core/thirdparty/stb_image_wrap.h b/src/libs/kpunch/libdvx/thirdparty/stb_image_wrap.h
similarity index 100%
rename from core/thirdparty/stb_image_wrap.h
rename to src/libs/kpunch/libdvx/thirdparty/stb_image_wrap.h
diff --git a/core/thirdparty/stb_image_write.h b/src/libs/kpunch/libdvx/thirdparty/stb_image_write.h
similarity index 100%
rename from core/thirdparty/stb_image_write.h
rename to src/libs/kpunch/libdvx/thirdparty/stb_image_write.h
diff --git a/core/thirdparty/stb_image_write_wrap.h b/src/libs/kpunch/libdvx/thirdparty/stb_image_write_wrap.h
similarity index 100%
rename from core/thirdparty/stb_image_write_wrap.h
rename to src/libs/kpunch/libdvx/thirdparty/stb_image_write_wrap.h
diff --git a/core/widgetClass.c b/src/libs/kpunch/libdvx/widgetClass.c
similarity index 100%
rename from core/widgetClass.c
rename to src/libs/kpunch/libdvx/widgetClass.c
diff --git a/core/widgetCore.c b/src/libs/kpunch/libdvx/widgetCore.c
similarity index 100%
rename from core/widgetCore.c
rename to src/libs/kpunch/libdvx/widgetCore.c
diff --git a/core/widgetEvent.c b/src/libs/kpunch/libdvx/widgetEvent.c
similarity index 100%
rename from core/widgetEvent.c
rename to src/libs/kpunch/libdvx/widgetEvent.c
diff --git a/core/widgetLayout.c b/src/libs/kpunch/libdvx/widgetLayout.c
similarity index 100%
rename from core/widgetLayout.c
rename to src/libs/kpunch/libdvx/widgetLayout.c
diff --git a/core/widgetOps.c b/src/libs/kpunch/libdvx/widgetOps.c
similarity index 99%
rename from core/widgetOps.c
rename to src/libs/kpunch/libdvx/widgetOps.c
index 25b266a..a27422a 100644
--- a/core/widgetOps.c
+++ b/src/libs/kpunch/libdvx/widgetOps.c
@@ -14,7 +14,7 @@
 #include "dvxWgtP.h"
 #include "dvxPlat.h"
 #include "stb_ds_wrap.h"
-#include "../widgets/box/box.h"
+#include "../../../widgets/kpunch/box/box.h"
 
 static bool sFullRepaint = false;
 
diff --git a/core/widgetScrollbar.c b/src/libs/kpunch/libdvx/widgetScrollbar.c
similarity index 100%
rename from core/widgetScrollbar.c
rename to src/libs/kpunch/libdvx/widgetScrollbar.c
diff --git a/tasks/Makefile b/src/libs/kpunch/libtasks/Makefile
similarity index 88%
rename from tasks/Makefile
rename to src/libs/kpunch/libtasks/Makefile
index b7f17ee..6b8b8e3 100644
--- a/tasks/Makefile
+++ b/src/libs/kpunch/libtasks/Makefile
@@ -7,8 +7,8 @@ CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
 CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586
 
-OBJDIR  = ../obj/tasks
-LIBSDIR = ../bin/libs
+OBJDIR  = ../../../../obj/tasks
+LIBSDIR = ../../../../bin/libs
 
 SRCS   = taskswitch.c
 OBJS   = $(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
@@ -36,7 +36,7 @@ $(TARGETDIR):
 	mkdir -p $(TARGETDIR)
 
 # Dependencies
-$(OBJDIR)/taskswitch.o: taskswitch.c taskSwch.h ../core/thirdparty/stb_ds.h
+$(OBJDIR)/taskswitch.o: taskswitch.c taskSwch.h ../libdvx/thirdparty/stb_ds.h
 
 clean:
 	rm -rf $(OBJS) $(TARGET) $(TARGETDIR)
diff --git a/tasks/README.md b/src/libs/kpunch/libtasks/README.md
similarity index 100%
rename from tasks/README.md
rename to src/libs/kpunch/libtasks/README.md
diff --git a/tasks/libtasks.dhs b/src/libs/kpunch/libtasks/libtasks.dhs
similarity index 100%
rename from tasks/libtasks.dhs
rename to src/libs/kpunch/libtasks/libtasks.dhs
diff --git a/tasks/taskSwch.h b/src/libs/kpunch/libtasks/taskSwch.h
similarity index 100%
rename from tasks/taskSwch.h
rename to src/libs/kpunch/libtasks/taskSwch.h
diff --git a/tasks/taskswitch.c b/src/libs/kpunch/libtasks/taskswitch.c
similarity index 99%
rename from tasks/taskswitch.c
rename to src/libs/kpunch/libtasks/taskswitch.c
index 5a6e5de..627c10e 100644
--- a/tasks/taskswitch.c
+++ b/src/libs/kpunch/libtasks/taskswitch.c
@@ -21,7 +21,7 @@
 // scheduler's linear scan. The downside (holes after termination) is
 // mitigated by slot recycling in findFreeSlot().
 
-#include "../core/thirdparty/stb_ds_wrap.h"
+#include "../libdvx/thirdparty/stb_ds_wrap.h"
 
 #include "taskSwch.h"
 #include <stdlib.h>
diff --git a/listhelp/Makefile b/src/libs/kpunch/listhelp/Makefile
similarity index 75%
rename from listhelp/Makefile
rename to src/libs/kpunch/listhelp/Makefile
index 0b7bc31..d05619b 100644
--- a/listhelp/Makefile
+++ b/src/libs/kpunch/listhelp/Makefile
@@ -6,10 +6,10 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I. -I../core -I../core/platform -I../tasks -I../core/thirdparty
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I. -I../libdvx -I../libdvx/platform -I../libtasks -I../libdvx/thirdparty
 
-OBJDIR  = ../obj/listhelp
-LIBSDIR = ../bin/libs
+OBJDIR  = ../../../../obj/listhelp
+LIBSDIR = ../../../../bin/libs
 
 SRCS   = listHelp.c
 OBJS   = $(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
@@ -20,7 +20,7 @@ TARGET    = $(TARGETDIR)/listhelp.lib
 
 all: $(TARGET) $(TARGETDIR)/listhelp.dep
 
-$(TARGETDIR)/listhelp.dep: ../config/listhelp.dep | $(TARGETDIR)
+$(TARGETDIR)/listhelp.dep: listhelp.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(TARGET): $(OBJS) | $(TARGETDIR)
@@ -40,7 +40,7 @@ $(TARGETDIR):
 	mkdir -p $(TARGETDIR)
 
 # Dependencies
-$(OBJDIR)/listHelp.o: listHelp.c listHelp.h ../core/dvxWgtP.h ../core/dvxWgt.h ../core/dvxTypes.h ../core/dvxApp.h ../core/dvxDraw.h ../core/dvxWm.h ../core/dvxVideo.h
+$(OBJDIR)/listHelp.o: listHelp.c listHelp.h ../libdvx/dvxWgtP.h ../libdvx/dvxWgt.h ../libdvx/dvxTypes.h ../libdvx/dvxApp.h ../libdvx/dvxDraw.h ../libdvx/dvxWm.h ../libdvx/dvxVideo.h
 
 clean:
 	rm -rf $(OBJS) $(TARGET) $(TARGETDIR)/listhelp.dep $(TARGETDIR)
diff --git a/listhelp/README.md b/src/libs/kpunch/listhelp/README.md
similarity index 100%
rename from listhelp/README.md
rename to src/libs/kpunch/listhelp/README.md
diff --git a/listhelp/listHelp.c b/src/libs/kpunch/listhelp/listHelp.c
similarity index 100%
rename from listhelp/listHelp.c
rename to src/libs/kpunch/listhelp/listHelp.c
diff --git a/listhelp/listHelp.h b/src/libs/kpunch/listhelp/listHelp.h
similarity index 98%
rename from listhelp/listHelp.h
rename to src/libs/kpunch/listhelp/listHelp.h
index c49f6c7..eb4f79c 100644
--- a/listhelp/listHelp.h
+++ b/src/libs/kpunch/listhelp/listHelp.h
@@ -7,7 +7,7 @@
 #ifndef LIST_HELP_H
 #define LIST_HELP_H
 
-#include "../core/dvxWgtP.h"
+#include "../libdvx/dvxWgtP.h"
 
 #define DROPDOWN_BTN_WIDTH   16
 #define DROPDOWN_MAX_VISIBLE 8
diff --git a/config/listhelp.dep b/src/libs/kpunch/listhelp/listhelp.dep
similarity index 100%
rename from config/listhelp.dep
rename to src/libs/kpunch/listhelp/listhelp.dep
diff --git a/listhelp/listhelp.dhs b/src/libs/kpunch/listhelp/listhelp.dhs
similarity index 100%
rename from listhelp/listhelp.dhs
rename to src/libs/kpunch/listhelp/listhelp.dhs
diff --git a/serial/Makefile b/src/libs/kpunch/serial/Makefile
similarity index 57%
rename from serial/Makefile
rename to src/libs/kpunch/serial/Makefile
index 9df587d..5508e76 100644
--- a/serial/Makefile
+++ b/src/libs/kpunch/serial/Makefile
@@ -6,12 +6,12 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-format-truncation -march=i486 -mtune=i586 -I../rs232 -I../packet -I../security -I../seclink -I../core -I../core/platform -I../tasks
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-format-truncation -march=i486 -mtune=i586 -Irs232 -Ipacket -Isecurity -Iseclink -I../libdvx -I../libdvx/platform -I../libtasks
 
-OBJDIR  = ../obj/serial
-LIBSDIR = ../bin/libs
+OBJDIR  = ../../../../obj/serial
+LIBSDIR = ../../../../bin/libs
 
-SRCS = ../rs232/rs232.c ../packet/packet.c ../security/security.c ../seclink/secLink.c
+SRCS = rs232/rs232.c packet/packet.c security/security.c seclink/secLink.c
 OBJS = $(OBJDIR)/rs232.o $(OBJDIR)/packet.o $(OBJDIR)/security.o $(OBJDIR)/secLink.o
 TARGETDIR = $(LIBSDIR)/kpunch/serial
 TARGET    = $(TARGETDIR)/serial.lib
@@ -20,23 +20,23 @@ TARGET    = $(TARGETDIR)/serial.lib
 
 all: $(TARGET) $(TARGETDIR)/serial.dep
 
-$(TARGETDIR)/serial.dep: ../config/serial.dep | $(TARGETDIR)
+$(TARGETDIR)/serial.dep: serial.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(TARGET): $(OBJS) | $(TARGETDIR)
 	$(DXE3GEN) -o $(TARGETDIR)/serial.dxe -U $(OBJS)
 	mv $(TARGETDIR)/serial.dxe $@
 
-$(OBJDIR)/rs232.o: ../rs232/rs232.c | $(OBJDIR)
+$(OBJDIR)/rs232.o: rs232/rs232.c | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/packet.o: ../packet/packet.c | $(OBJDIR)
+$(OBJDIR)/packet.o: packet/packet.c | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/security.o: ../security/security.c | $(OBJDIR)
+$(OBJDIR)/security.o: security/security.c | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/secLink.o: ../seclink/secLink.c | $(OBJDIR)
+$(OBJDIR)/secLink.o: seclink/secLink.c | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 $(OBJDIR):
@@ -49,10 +49,10 @@ $(TARGETDIR):
 	mkdir -p $(TARGETDIR)
 
 # Dependencies
-$(OBJDIR)/rs232.o: ../rs232/rs232.c ../rs232/rs232.h
-$(OBJDIR)/packet.o: ../packet/packet.c ../packet/packet.h ../rs232/rs232.h
-$(OBJDIR)/security.o: ../security/security.c ../security/security.h
-$(OBJDIR)/secLink.o: ../seclink/secLink.c ../seclink/secLink.h ../rs232/rs232.h ../packet/packet.h ../security/security.h
+$(OBJDIR)/rs232.o: rs232/rs232.c rs232/rs232.h
+$(OBJDIR)/packet.o: packet/packet.c packet/packet.h rs232/rs232.h
+$(OBJDIR)/security.o: security/security.c security/security.h
+$(OBJDIR)/secLink.o: seclink/secLink.c seclink/secLink.h rs232/rs232.h packet/packet.h security/security.h
 
 clean:
 	rm -rf $(OBJS) $(TARGET) $(TARGETDIR)/serial.dep $(TARGETDIR)
diff --git a/packet/Makefile b/src/libs/kpunch/serial/packet/Makefile
similarity index 100%
rename from packet/Makefile
rename to src/libs/kpunch/serial/packet/Makefile
diff --git a/packet/README.md b/src/libs/kpunch/serial/packet/README.md
similarity index 100%
rename from packet/README.md
rename to src/libs/kpunch/serial/packet/README.md
diff --git a/packet/packet.c b/src/libs/kpunch/serial/packet/packet.c
similarity index 100%
rename from packet/packet.c
rename to src/libs/kpunch/serial/packet/packet.c
diff --git a/packet/packet.h b/src/libs/kpunch/serial/packet/packet.h
similarity index 100%
rename from packet/packet.h
rename to src/libs/kpunch/serial/packet/packet.h
diff --git a/rs232/Makefile b/src/libs/kpunch/serial/rs232/Makefile
similarity index 100%
rename from rs232/Makefile
rename to src/libs/kpunch/serial/rs232/Makefile
diff --git a/rs232/README.md b/src/libs/kpunch/serial/rs232/README.md
similarity index 100%
rename from rs232/README.md
rename to src/libs/kpunch/serial/rs232/README.md
diff --git a/rs232/rs232.c b/src/libs/kpunch/serial/rs232/rs232.c
similarity index 100%
rename from rs232/rs232.c
rename to src/libs/kpunch/serial/rs232/rs232.c
diff --git a/rs232/rs232.h b/src/libs/kpunch/serial/rs232/rs232.h
similarity index 100%
rename from rs232/rs232.h
rename to src/libs/kpunch/serial/rs232/rs232.h
diff --git a/seclink/Makefile b/src/libs/kpunch/serial/seclink/Makefile
similarity index 100%
rename from seclink/Makefile
rename to src/libs/kpunch/serial/seclink/Makefile
diff --git a/seclink/README.md b/src/libs/kpunch/serial/seclink/README.md
similarity index 100%
rename from seclink/README.md
rename to src/libs/kpunch/serial/seclink/README.md
diff --git a/seclink/secLink.c b/src/libs/kpunch/serial/seclink/secLink.c
similarity index 100%
rename from seclink/secLink.c
rename to src/libs/kpunch/serial/seclink/secLink.c
diff --git a/seclink/secLink.h b/src/libs/kpunch/serial/seclink/secLink.h
similarity index 100%
rename from seclink/secLink.h
rename to src/libs/kpunch/serial/seclink/secLink.h
diff --git a/security/Makefile b/src/libs/kpunch/serial/security/Makefile
similarity index 100%
rename from security/Makefile
rename to src/libs/kpunch/serial/security/Makefile
diff --git a/security/README.md b/src/libs/kpunch/serial/security/README.md
similarity index 100%
rename from security/README.md
rename to src/libs/kpunch/serial/security/README.md
diff --git a/security/security.c b/src/libs/kpunch/serial/security/security.c
similarity index 100%
rename from security/security.c
rename to src/libs/kpunch/serial/security/security.c
diff --git a/security/security.h b/src/libs/kpunch/serial/security/security.h
similarity index 100%
rename from security/security.h
rename to src/libs/kpunch/serial/security/security.h
diff --git a/config/serial.dep b/src/libs/kpunch/serial/serial.dep
similarity index 100%
rename from config/serial.dep
rename to src/libs/kpunch/serial/serial.dep
diff --git a/serial/serial.dhs b/src/libs/kpunch/serial/serial.dhs
similarity index 100%
rename from serial/serial.dhs
rename to src/libs/kpunch/serial/serial.dhs
diff --git a/sql/Makefile b/src/libs/kpunch/sql/Makefile
similarity index 95%
rename from sql/Makefile
rename to src/libs/kpunch/sql/Makefile
index 1f9a382..ca212cf 100644
--- a/sql/Makefile
+++ b/src/libs/kpunch/sql/Makefile
@@ -18,12 +18,12 @@ SQLITE_SRC    = $(SQLITE_DIR)/src
 SQLITE_TOOL   = $(SQLITE_DIR)/tool
 
 CFLAGS        = -O2 -Wall -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -Wno-address -march=i486 -mtune=i586 \
-                -I../core -I../core/platform -I../tasks \
+                -I../libdvx -I../libdvx/platform -I../libtasks \
                 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
                 -I$(SQLITE_SRC) -I$(SQLITE_DIR)/examples -I$(OBJDIR)
 
-OBJDIR    = ../obj/sql
-LIBSDIR   = ../bin/libs
+OBJDIR    = ../../../../obj/sql
+LIBSDIR   = ../../../../bin/libs
 TARGETDIR = $(LIBSDIR)/kpunch/dvxsql
 TARGET    = $(TARGETDIR)/dvxsql.lib
 
@@ -57,7 +57,7 @@ OBJS = $(OBJDIR)/dvxSql.o $(SQLITE_OBJS) $(OBJDIR)/sqlite_parse.o $(OBJDIR)/sqli
 
 all: $(TARGET) $(TARGETDIR)/dvxsql.dep
 
-$(TARGETDIR)/dvxsql.dep: ../config/dvxsql.dep | $(TARGETDIR)
+$(TARGETDIR)/dvxsql.dep: dvxsql.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 # ---- Phase 1: Native tools and generated files ----
diff --git a/sql/dvxSql.c b/src/libs/kpunch/sql/dvxSql.c
similarity index 100%
rename from sql/dvxSql.c
rename to src/libs/kpunch/sql/dvxSql.c
diff --git a/sql/dvxSql.h b/src/libs/kpunch/sql/dvxSql.h
similarity index 100%
rename from sql/dvxSql.h
rename to src/libs/kpunch/sql/dvxSql.h
diff --git a/config/dvxsql.dep b/src/libs/kpunch/sql/dvxsql.dep
similarity index 100%
rename from config/dvxsql.dep
rename to src/libs/kpunch/sql/dvxsql.dep
diff --git a/sql/dvxsql.dhs b/src/libs/kpunch/sql/dvxsql.dhs
similarity index 100%
rename from sql/dvxsql.dhs
rename to src/libs/kpunch/sql/dvxsql.dhs
diff --git a/sql/thirdparty/sqlite/Makefile b/src/libs/kpunch/sql/thirdparty/sqlite/Makefile
similarity index 100%
rename from sql/thirdparty/sqlite/Makefile
rename to src/libs/kpunch/sql/thirdparty/sqlite/Makefile
diff --git a/sql/thirdparty/sqlite/Makefile.arm b/src/libs/kpunch/sql/thirdparty/sqlite/Makefile.arm
similarity index 100%
rename from sql/thirdparty/sqlite/Makefile.arm
rename to src/libs/kpunch/sql/thirdparty/sqlite/Makefile.arm
diff --git a/sql/thirdparty/sqlite/Makefile.in b/src/libs/kpunch/sql/thirdparty/sqlite/Makefile.in
similarity index 100%
rename from sql/thirdparty/sqlite/Makefile.in
rename to src/libs/kpunch/sql/thirdparty/sqlite/Makefile.in
diff --git a/sql/thirdparty/sqlite/Makefile.linux-gcc b/src/libs/kpunch/sql/thirdparty/sqlite/Makefile.linux-gcc
similarity index 100%
rename from sql/thirdparty/sqlite/Makefile.linux-gcc
rename to src/libs/kpunch/sql/thirdparty/sqlite/Makefile.linux-gcc
diff --git a/sql/thirdparty/sqlite/Makefile.org b/src/libs/kpunch/sql/thirdparty/sqlite/Makefile.org
similarity index 100%
rename from sql/thirdparty/sqlite/Makefile.org
rename to src/libs/kpunch/sql/thirdparty/sqlite/Makefile.org
diff --git a/sql/thirdparty/sqlite/README b/src/libs/kpunch/sql/thirdparty/sqlite/README
similarity index 100%
rename from sql/thirdparty/sqlite/README
rename to src/libs/kpunch/sql/thirdparty/sqlite/README
diff --git a/sql/thirdparty/sqlite/VERSION b/src/libs/kpunch/sql/thirdparty/sqlite/VERSION
similarity index 100%
rename from sql/thirdparty/sqlite/VERSION
rename to src/libs/kpunch/sql/thirdparty/sqlite/VERSION
diff --git a/sql/thirdparty/sqlite/aclocal.m4 b/src/libs/kpunch/sql/thirdparty/sqlite/aclocal.m4
similarity index 100%
rename from sql/thirdparty/sqlite/aclocal.m4
rename to src/libs/kpunch/sql/thirdparty/sqlite/aclocal.m4
diff --git a/sql/thirdparty/sqlite/addopcodes.awk b/src/libs/kpunch/sql/thirdparty/sqlite/addopcodes.awk
similarity index 100%
rename from sql/thirdparty/sqlite/addopcodes.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/addopcodes.awk
diff --git a/sql/thirdparty/sqlite/art/2005osaward.gif b/src/libs/kpunch/sql/thirdparty/sqlite/art/2005osaward.gif
similarity index 100%
rename from sql/thirdparty/sqlite/art/2005osaward.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/2005osaward.gif
diff --git a/sql/thirdparty/sqlite/art/SQLite.eps b/src/libs/kpunch/sql/thirdparty/sqlite/art/SQLite.eps
similarity index 100%
rename from sql/thirdparty/sqlite/art/SQLite.eps
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/SQLite.eps
diff --git a/sql/thirdparty/sqlite/art/SQLite.gif b/src/libs/kpunch/sql/thirdparty/sqlite/art/SQLite.gif
similarity index 100%
rename from sql/thirdparty/sqlite/art/SQLite.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/SQLite.gif
diff --git a/sql/thirdparty/sqlite/art/SQLiteLogo3.tiff b/src/libs/kpunch/sql/thirdparty/sqlite/art/SQLiteLogo3.tiff
similarity index 100%
rename from sql/thirdparty/sqlite/art/SQLiteLogo3.tiff
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/SQLiteLogo3.tiff
diff --git a/sql/thirdparty/sqlite/art/SQLite_big.gif b/src/libs/kpunch/sql/thirdparty/sqlite/art/SQLite_big.gif
similarity index 100%
rename from sql/thirdparty/sqlite/art/SQLite_big.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/SQLite_big.gif
diff --git a/sql/thirdparty/sqlite/art/nocopy.gif b/src/libs/kpunch/sql/thirdparty/sqlite/art/nocopy.gif
similarity index 100%
rename from sql/thirdparty/sqlite/art/nocopy.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/nocopy.gif
diff --git a/sql/thirdparty/sqlite/art/powered_by_sqlite.gif b/src/libs/kpunch/sql/thirdparty/sqlite/art/powered_by_sqlite.gif
similarity index 100%
rename from sql/thirdparty/sqlite/art/powered_by_sqlite.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/art/powered_by_sqlite.gif
diff --git a/sql/thirdparty/sqlite/config.guess b/src/libs/kpunch/sql/thirdparty/sqlite/config.guess
similarity index 100%
rename from sql/thirdparty/sqlite/config.guess
rename to src/libs/kpunch/sql/thirdparty/sqlite/config.guess
diff --git a/sql/thirdparty/sqlite/config.status b/src/libs/kpunch/sql/thirdparty/sqlite/config.status
similarity index 100%
rename from sql/thirdparty/sqlite/config.status
rename to src/libs/kpunch/sql/thirdparty/sqlite/config.status
diff --git a/sql/thirdparty/sqlite/config.sub b/src/libs/kpunch/sql/thirdparty/sqlite/config.sub
similarity index 100%
rename from sql/thirdparty/sqlite/config.sub
rename to src/libs/kpunch/sql/thirdparty/sqlite/config.sub
diff --git a/sql/thirdparty/sqlite/configure b/src/libs/kpunch/sql/thirdparty/sqlite/configure
similarity index 100%
rename from sql/thirdparty/sqlite/configure
rename to src/libs/kpunch/sql/thirdparty/sqlite/configure
diff --git a/sql/thirdparty/sqlite/configure.ac b/src/libs/kpunch/sql/thirdparty/sqlite/configure.ac
similarity index 100%
rename from sql/thirdparty/sqlite/configure.ac
rename to src/libs/kpunch/sql/thirdparty/sqlite/configure.ac
diff --git a/sql/thirdparty/sqlite/contrib/sqlitecon.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/contrib/sqlitecon.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/contrib/sqlitecon.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/contrib/sqlitecon.tcl
diff --git a/sql/thirdparty/sqlite/doc/lemon.html b/src/libs/kpunch/sql/thirdparty/sqlite/doc/lemon.html
similarity index 100%
rename from sql/thirdparty/sqlite/doc/lemon.html
rename to src/libs/kpunch/sql/thirdparty/sqlite/doc/lemon.html
diff --git a/sql/thirdparty/sqlite/doc/report1.txt b/src/libs/kpunch/sql/thirdparty/sqlite/doc/report1.txt
similarity index 100%
rename from sql/thirdparty/sqlite/doc/report1.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/doc/report1.txt
diff --git a/sql/thirdparty/sqlite/ex1 b/src/libs/kpunch/sql/thirdparty/sqlite/ex1
similarity index 100%
rename from sql/thirdparty/sqlite/ex1
rename to src/libs/kpunch/sql/thirdparty/sqlite/ex1
diff --git a/sql/thirdparty/sqlite/examples/c1.bat b/src/libs/kpunch/sql/thirdparty/sqlite/examples/c1.bat
similarity index 100%
rename from sql/thirdparty/sqlite/examples/c1.bat
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/c1.bat
diff --git a/sql/thirdparty/sqlite/examples/c2.bat b/src/libs/kpunch/sql/thirdparty/sqlite/examples/c2.bat
similarity index 100%
rename from sql/thirdparty/sqlite/examples/c2.bat
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/c2.bat
diff --git a/sql/thirdparty/sqlite/examples/c3.bat b/src/libs/kpunch/sql/thirdparty/sqlite/examples/c3.bat
similarity index 100%
rename from sql/thirdparty/sqlite/examples/c3.bat
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/c3.bat
diff --git a/sql/thirdparty/sqlite/examples/example1.cpp b/src/libs/kpunch/sql/thirdparty/sqlite/examples/example1.cpp
similarity index 100%
rename from sql/thirdparty/sqlite/examples/example1.cpp
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/example1.cpp
diff --git a/sql/thirdparty/sqlite/examples/example2.cpp b/src/libs/kpunch/sql/thirdparty/sqlite/examples/example2.cpp
similarity index 100%
rename from sql/thirdparty/sqlite/examples/example2.cpp
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/example2.cpp
diff --git a/sql/thirdparty/sqlite/examples/example3.c b/src/libs/kpunch/sql/thirdparty/sqlite/examples/example3.c
similarity index 100%
rename from sql/thirdparty/sqlite/examples/example3.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/example3.c
diff --git a/sql/thirdparty/sqlite/examples/notes.txt b/src/libs/kpunch/sql/thirdparty/sqlite/examples/notes.txt
similarity index 100%
rename from sql/thirdparty/sqlite/examples/notes.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/notes.txt
diff --git a/sql/thirdparty/sqlite/examples/sqlite3.h b/src/libs/kpunch/sql/thirdparty/sqlite/examples/sqlite3.h
similarity index 100%
rename from sql/thirdparty/sqlite/examples/sqlite3.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/examples/sqlite3.h
diff --git a/sql/thirdparty/sqlite/ext/README.txt b/src/libs/kpunch/sql/thirdparty/sqlite/ext/README.txt
similarity index 100%
rename from sql/thirdparty/sqlite/ext/README.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/README.txt
diff --git a/sql/thirdparty/sqlite/ext/fts1/CVS/Entries b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/CVS/Entries
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/CVS/Entries
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/CVS/Entries
diff --git a/sql/thirdparty/sqlite/ext/fts1/CVS/Repository b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/CVS/Repository
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/CVS/Repository
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/CVS/Repository
diff --git a/sql/thirdparty/sqlite/ext/fts1/CVS/Root b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/CVS/Root
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/CVS/Root
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/CVS/Root
diff --git a/sql/thirdparty/sqlite/ext/fts1/README.txt b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/README.txt
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/README.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/README.txt
diff --git a/sql/thirdparty/sqlite/ext/fts1/ft_hash.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/ft_hash.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/ft_hash.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/ft_hash.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/ft_hash.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/ft_hash.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/ft_hash.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/ft_hash.h
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1.h
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1_hash.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_hash.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1_hash.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_hash.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1_hash.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_hash.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1_hash.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_hash.h
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1_porter.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_porter.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1_porter.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_porter.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer.h
diff --git a/sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer1.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer1.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer1.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fts1_tokenizer1.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/fulltext.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fulltext.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fulltext.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fulltext.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/fulltext.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fulltext.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/fulltext.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/fulltext.h
diff --git a/sql/thirdparty/sqlite/ext/fts1/simple_tokenizer.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/simple_tokenizer.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/simple_tokenizer.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/simple_tokenizer.c
diff --git a/sql/thirdparty/sqlite/ext/fts1/tokenizer.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/tokenizer.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts1/tokenizer.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts1/tokenizer.h
diff --git a/sql/thirdparty/sqlite/ext/fts2/CVS/Entries b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/CVS/Entries
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/CVS/Entries
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/CVS/Entries
diff --git a/sql/thirdparty/sqlite/ext/fts2/CVS/Repository b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/CVS/Repository
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/CVS/Repository
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/CVS/Repository
diff --git a/sql/thirdparty/sqlite/ext/fts2/CVS/Root b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/CVS/Root
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/CVS/Root
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/CVS/Root
diff --git a/sql/thirdparty/sqlite/ext/fts2/README.tokenizers b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/README.tokenizers
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/README.tokenizers
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/README.tokenizers
diff --git a/sql/thirdparty/sqlite/ext/fts2/README.txt b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/README.txt
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/README.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/README.txt
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2.c
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2.h
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_hash.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_hash.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_hash.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_hash.c
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_hash.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_hash.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_hash.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_hash.h
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_icu.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_icu.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_icu.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_icu.c
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_porter.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_porter.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_porter.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_porter.c
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.c
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer.h
diff --git a/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer1.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer1.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer1.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/fts2_tokenizer1.c
diff --git a/sql/thirdparty/sqlite/ext/fts2/mkfts2amal.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/mkfts2amal.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts2/mkfts2amal.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts2/mkfts2amal.tcl
diff --git a/sql/thirdparty/sqlite/ext/fts3/CVS/Entries b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/CVS/Entries
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/CVS/Entries
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/CVS/Entries
diff --git a/sql/thirdparty/sqlite/ext/fts3/CVS/Repository b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/CVS/Repository
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/CVS/Repository
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/CVS/Repository
diff --git a/sql/thirdparty/sqlite/ext/fts3/CVS/Root b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/CVS/Root
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/CVS/Root
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/CVS/Root
diff --git a/sql/thirdparty/sqlite/ext/fts3/README.tokenizers b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/README.tokenizers
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/README.tokenizers
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/README.tokenizers
diff --git a/sql/thirdparty/sqlite/ext/fts3/README.txt b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/README.txt
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/README.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/README.txt
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3.c
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3.h
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_hash.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_hash.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_hash.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_hash.c
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_hash.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_hash.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_hash.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_hash.h
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_icu.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_icu.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_icu.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_icu.c
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_porter.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_porter.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_porter.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_porter.c
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.c
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.h b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.h
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer.h
diff --git a/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer1.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer1.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer1.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/fts3_tokenizer1.c
diff --git a/sql/thirdparty/sqlite/ext/fts3/mkfts3amal.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/mkfts3amal.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/ext/fts3/mkfts3amal.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/fts3/mkfts3amal.tcl
diff --git a/sql/thirdparty/sqlite/ext/icu/CVS/Entries b/src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/CVS/Entries
similarity index 100%
rename from sql/thirdparty/sqlite/ext/icu/CVS/Entries
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/CVS/Entries
diff --git a/sql/thirdparty/sqlite/ext/icu/CVS/Repository b/src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/CVS/Repository
similarity index 100%
rename from sql/thirdparty/sqlite/ext/icu/CVS/Repository
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/CVS/Repository
diff --git a/sql/thirdparty/sqlite/ext/icu/CVS/Root b/src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/CVS/Root
similarity index 100%
rename from sql/thirdparty/sqlite/ext/icu/CVS/Root
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/CVS/Root
diff --git a/sql/thirdparty/sqlite/ext/icu/README.txt b/src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/README.txt
similarity index 100%
rename from sql/thirdparty/sqlite/ext/icu/README.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/README.txt
diff --git a/sql/thirdparty/sqlite/ext/icu/icu.c b/src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/icu.c
similarity index 100%
rename from sql/thirdparty/sqlite/ext/icu/icu.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/ext/icu/icu.c
diff --git a/sql/thirdparty/sqlite/install.sh b/src/libs/kpunch/sql/thirdparty/sqlite/install.sh
similarity index 100%
rename from sql/thirdparty/sqlite/install.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/install.sh
diff --git a/sql/thirdparty/sqlite/libtool b/src/libs/kpunch/sql/thirdparty/sqlite/libtool
similarity index 100%
rename from sql/thirdparty/sqlite/libtool
rename to src/libs/kpunch/sql/thirdparty/sqlite/libtool
diff --git a/sql/thirdparty/sqlite/ltmain.sh b/src/libs/kpunch/sql/thirdparty/sqlite/ltmain.sh
similarity index 100%
rename from sql/thirdparty/sqlite/ltmain.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/ltmain.sh
diff --git a/sql/thirdparty/sqlite/main.mk b/src/libs/kpunch/sql/thirdparty/sqlite/main.mk
similarity index 100%
rename from sql/thirdparty/sqlite/main.mk
rename to src/libs/kpunch/sql/thirdparty/sqlite/main.mk
diff --git a/sql/thirdparty/sqlite/mkdll.sh b/src/libs/kpunch/sql/thirdparty/sqlite/mkdll.sh
similarity index 100%
rename from sql/thirdparty/sqlite/mkdll.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkdll.sh
diff --git a/sql/thirdparty/sqlite/mkextu.sh b/src/libs/kpunch/sql/thirdparty/sqlite/mkextu.sh
similarity index 100%
rename from sql/thirdparty/sqlite/mkextu.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkextu.sh
diff --git a/sql/thirdparty/sqlite/mkextw.sh b/src/libs/kpunch/sql/thirdparty/sqlite/mkextw.sh
similarity index 100%
rename from sql/thirdparty/sqlite/mkextw.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkextw.sh
diff --git a/sql/thirdparty/sqlite/mkopcodc.awk b/src/libs/kpunch/sql/thirdparty/sqlite/mkopcodc.awk
similarity index 100%
rename from sql/thirdparty/sqlite/mkopcodc.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkopcodc.awk
diff --git a/sql/thirdparty/sqlite/mkopcodec.awk b/src/libs/kpunch/sql/thirdparty/sqlite/mkopcodec.awk
similarity index 100%
rename from sql/thirdparty/sqlite/mkopcodec.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkopcodec.awk
diff --git a/sql/thirdparty/sqlite/mkopcodeh.awk b/src/libs/kpunch/sql/thirdparty/sqlite/mkopcodeh.awk
similarity index 100%
rename from sql/thirdparty/sqlite/mkopcodeh.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkopcodeh.awk
diff --git a/sql/thirdparty/sqlite/mkso.sh b/src/libs/kpunch/sql/thirdparty/sqlite/mkso.sh
similarity index 100%
rename from sql/thirdparty/sqlite/mkso.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/mkso.sh
diff --git a/sql/thirdparty/sqlite/notesDOS.txt b/src/libs/kpunch/sql/thirdparty/sqlite/notesDOS.txt
similarity index 100%
rename from sql/thirdparty/sqlite/notesDOS.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/notesDOS.txt
diff --git a/sql/thirdparty/sqlite/publish.sh b/src/libs/kpunch/sql/thirdparty/sqlite/publish.sh
similarity index 100%
rename from sql/thirdparty/sqlite/publish.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/publish.sh
diff --git a/sql/thirdparty/sqlite/publish_osx.sh b/src/libs/kpunch/sql/thirdparty/sqlite/publish_osx.sh
similarity index 100%
rename from sql/thirdparty/sqlite/publish_osx.sh
rename to src/libs/kpunch/sql/thirdparty/sqlite/publish_osx.sh
diff --git a/sql/thirdparty/sqlite/spec.template b/src/libs/kpunch/sql/thirdparty/sqlite/spec.template
similarity index 100%
rename from sql/thirdparty/sqlite/spec.template
rename to src/libs/kpunch/sql/thirdparty/sqlite/spec.template
diff --git a/sql/thirdparty/sqlite/sqlite.pc.in b/src/libs/kpunch/sql/thirdparty/sqlite/sqlite.pc.in
similarity index 100%
rename from sql/thirdparty/sqlite/sqlite.pc.in
rename to src/libs/kpunch/sql/thirdparty/sqlite/sqlite.pc.in
diff --git a/sql/thirdparty/sqlite/sqlite3.1 b/src/libs/kpunch/sql/thirdparty/sqlite/sqlite3.1
similarity index 100%
rename from sql/thirdparty/sqlite/sqlite3.1
rename to src/libs/kpunch/sql/thirdparty/sqlite/sqlite3.1
diff --git a/sql/thirdparty/sqlite/sqlite3.pc b/src/libs/kpunch/sql/thirdparty/sqlite/sqlite3.pc
similarity index 100%
rename from sql/thirdparty/sqlite/sqlite3.pc
rename to src/libs/kpunch/sql/thirdparty/sqlite/sqlite3.pc
diff --git a/sql/thirdparty/sqlite/sqlite3.pc.in b/src/libs/kpunch/sql/thirdparty/sqlite/sqlite3.pc.in
similarity index 100%
rename from sql/thirdparty/sqlite/sqlite3.pc.in
rename to src/libs/kpunch/sql/thirdparty/sqlite/sqlite3.pc.in
diff --git a/sql/thirdparty/sqlite/src/alter.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/alter.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/alter.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/alter.c
diff --git a/sql/thirdparty/sqlite/src/analyze.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/analyze.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/analyze.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/analyze.c
diff --git a/sql/thirdparty/sqlite/src/attach.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/attach.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/attach.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/attach.c
diff --git a/sql/thirdparty/sqlite/src/auth.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/auth.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/auth.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/auth.c
diff --git a/sql/thirdparty/sqlite/src/btmutex.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/btmutex.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/btmutex.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/btmutex.c
diff --git a/sql/thirdparty/sqlite/src/btree.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/btree.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/btree.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/btree.c
diff --git a/sql/thirdparty/sqlite/src/btree.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/btree.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/btree.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/btree.h
diff --git a/sql/thirdparty/sqlite/src/btreeInt.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/btreeInt.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/btreeInt.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/btreeInt.h
diff --git a/sql/thirdparty/sqlite/src/build.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/build.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/build.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/build.c
diff --git a/sql/thirdparty/sqlite/src/callback.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/callback.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/callback.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/callback.c
diff --git a/sql/thirdparty/sqlite/src/complete.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/complete.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/complete.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/complete.c
diff --git a/sql/thirdparty/sqlite/src/date.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/date.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/date.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/date.c
diff --git a/sql/thirdparty/sqlite/src/delete.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/delete.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/delete.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/delete.c
diff --git a/sql/thirdparty/sqlite/src/experimental.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/experimental.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/experimental.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/experimental.c
diff --git a/sql/thirdparty/sqlite/src/expr.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/expr.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/expr.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/expr.c
diff --git a/sql/thirdparty/sqlite/src/fault.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/fault.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/fault.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/fault.c
diff --git a/sql/thirdparty/sqlite/src/func.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/func.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/func.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/func.c
diff --git a/sql/thirdparty/sqlite/src/hash.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/hash.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/hash.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/hash.c
diff --git a/sql/thirdparty/sqlite/src/hash.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/hash.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/hash.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/hash.h
diff --git a/sql/thirdparty/sqlite/src/insert.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/insert.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/insert.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/insert.c
diff --git a/sql/thirdparty/sqlite/src/journal.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/journal.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/journal.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/journal.c
diff --git a/sql/thirdparty/sqlite/src/legacy.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/legacy.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/legacy.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/legacy.c
diff --git a/sql/thirdparty/sqlite/src/limits.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/limits.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/limits.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/limits.h
diff --git a/sql/thirdparty/sqlite/src/loadext.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/loadext.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/loadext.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/loadext.c
diff --git a/sql/thirdparty/sqlite/src/main.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/main.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/main.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/main.c
diff --git a/sql/thirdparty/sqlite/src/malloc.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/malloc.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/malloc.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/malloc.c
diff --git a/sql/thirdparty/sqlite/src/md5.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/md5.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/md5.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/md5.c
diff --git a/sql/thirdparty/sqlite/src/mem1.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mem1.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mem1.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mem1.c
diff --git a/sql/thirdparty/sqlite/src/mem2.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mem2.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mem2.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mem2.c
diff --git a/sql/thirdparty/sqlite/src/mem3.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mem3.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mem3.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mem3.c
diff --git a/sql/thirdparty/sqlite/src/mem4.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mem4.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mem4.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mem4.c
diff --git a/sql/thirdparty/sqlite/src/mutex.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mutex.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mutex.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mutex.c
diff --git a/sql/thirdparty/sqlite/src/mutex.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/mutex.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/mutex.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mutex.h
diff --git a/sql/thirdparty/sqlite/src/mutex_os2.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mutex_os2.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mutex_os2.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mutex_os2.c
diff --git a/sql/thirdparty/sqlite/src/mutex_unix.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mutex_unix.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mutex_unix.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mutex_unix.c
diff --git a/sql/thirdparty/sqlite/src/mutex_w32.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/mutex_w32.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/mutex_w32.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/mutex_w32.c
diff --git a/sql/thirdparty/sqlite/src/os.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/os.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/os.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os.c
diff --git a/sql/thirdparty/sqlite/src/os.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/os.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/os.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os.h
diff --git a/sql/thirdparty/sqlite/src/os_common.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_common.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_common.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_common.h
diff --git a/sql/thirdparty/sqlite/src/os_os2.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_os2.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_os2.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_os2.c
diff --git a/sql/thirdparty/sqlite/src/os_os2.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_os2.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_os2.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_os2.h
diff --git a/sql/thirdparty/sqlite/src/os_test.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_test.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_test.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_test.c
diff --git a/sql/thirdparty/sqlite/src/os_test.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_test.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_test.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_test.h
diff --git a/sql/thirdparty/sqlite/src/os_unix.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_unix.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_unix.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_unix.c
diff --git a/sql/thirdparty/sqlite/src/os_unix.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_unix.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_unix.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_unix.h
diff --git a/sql/thirdparty/sqlite/src/os_win.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_win.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_win.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_win.c
diff --git a/sql/thirdparty/sqlite/src/os_win.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/os_win.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/os_win.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/os_win.h
diff --git a/sql/thirdparty/sqlite/src/pager.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/pager.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/pager.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/pager.c
diff --git a/sql/thirdparty/sqlite/src/pager.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/pager.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/pager.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/pager.h
diff --git a/sql/thirdparty/sqlite/src/parse.y b/src/libs/kpunch/sql/thirdparty/sqlite/src/parse.y
similarity index 100%
rename from sql/thirdparty/sqlite/src/parse.y
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/parse.y
diff --git a/sql/thirdparty/sqlite/src/pragma.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/pragma.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/pragma.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/pragma.c
diff --git a/sql/thirdparty/sqlite/src/prepare.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/prepare.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/prepare.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/prepare.c
diff --git a/sql/thirdparty/sqlite/src/printf.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/printf.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/printf.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/printf.c
diff --git a/sql/thirdparty/sqlite/src/random.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/random.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/random.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/random.c
diff --git a/sql/thirdparty/sqlite/src/select.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/select.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/select.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/select.c
diff --git a/sql/thirdparty/sqlite/src/server.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/server.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/server.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/server.c
diff --git a/sql/thirdparty/sqlite/src/shell.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/shell.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/shell.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/shell.c
diff --git a/sql/thirdparty/sqlite/src/sqlite.h.in b/src/libs/kpunch/sql/thirdparty/sqlite/src/sqlite.h.in
similarity index 100%
rename from sql/thirdparty/sqlite/src/sqlite.h.in
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/sqlite.h.in
diff --git a/sql/thirdparty/sqlite/src/sqlite3ext.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/sqlite3ext.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/sqlite3ext.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/sqlite3ext.h
diff --git a/sql/thirdparty/sqlite/src/sqliteInt.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/sqliteInt.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/sqliteInt.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/sqliteInt.h
diff --git a/sql/thirdparty/sqlite/src/sqliteLimit.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/sqliteLimit.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/sqliteLimit.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/sqliteLimit.h
diff --git a/sql/thirdparty/sqlite/src/table.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/table.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/table.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/table.c
diff --git a/sql/thirdparty/sqlite/src/tclsqlite.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/tclsqlite.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/tclsqlite.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/tclsqlite.c
diff --git a/sql/thirdparty/sqlite/src/test1.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test1.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test1.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test1.c
diff --git a/sql/thirdparty/sqlite/src/test2.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test2.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test2.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test2.c
diff --git a/sql/thirdparty/sqlite/src/test3.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test3.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test3.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test3.c
diff --git a/sql/thirdparty/sqlite/src/test4.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test4.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test4.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test4.c
diff --git a/sql/thirdparty/sqlite/src/test5.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test5.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test5.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test5.c
diff --git a/sql/thirdparty/sqlite/src/test6.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test6.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test6.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test6.c
diff --git a/sql/thirdparty/sqlite/src/test7.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test7.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test7.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test7.c
diff --git a/sql/thirdparty/sqlite/src/test8.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test8.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test8.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test8.c
diff --git a/sql/thirdparty/sqlite/src/test9.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test9.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test9.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test9.c
diff --git a/sql/thirdparty/sqlite/src/test_async.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_async.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_async.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_async.c
diff --git a/sql/thirdparty/sqlite/src/test_autoext.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_autoext.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_autoext.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_autoext.c
diff --git a/sql/thirdparty/sqlite/src/test_btree.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_btree.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_btree.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_btree.c
diff --git a/sql/thirdparty/sqlite/src/test_config.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_config.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_config.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_config.c
diff --git a/sql/thirdparty/sqlite/src/test_devsym.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_devsym.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_devsym.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_devsym.c
diff --git a/sql/thirdparty/sqlite/src/test_hexio.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_hexio.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_hexio.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_hexio.c
diff --git a/sql/thirdparty/sqlite/src/test_loadext.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_loadext.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_loadext.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_loadext.c
diff --git a/sql/thirdparty/sqlite/src/test_malloc.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_malloc.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_malloc.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_malloc.c
diff --git a/sql/thirdparty/sqlite/src/test_md5.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_md5.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_md5.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_md5.c
diff --git a/sql/thirdparty/sqlite/src/test_onefile.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_onefile.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_onefile.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_onefile.c
diff --git a/sql/thirdparty/sqlite/src/test_schema.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_schema.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_schema.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_schema.c
diff --git a/sql/thirdparty/sqlite/src/test_server.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_server.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_server.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_server.c
diff --git a/sql/thirdparty/sqlite/src/test_tclvar.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_tclvar.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_tclvar.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_tclvar.c
diff --git a/sql/thirdparty/sqlite/src/test_thread.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/test_thread.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/test_thread.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/test_thread.c
diff --git a/sql/thirdparty/sqlite/src/tokenize.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/tokenize.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/tokenize.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/tokenize.c
diff --git a/sql/thirdparty/sqlite/src/trigger.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/trigger.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/trigger.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/trigger.c
diff --git a/sql/thirdparty/sqlite/src/update.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/update.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/update.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/update.c
diff --git a/sql/thirdparty/sqlite/src/utf.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/utf.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/utf.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/utf.c
diff --git a/sql/thirdparty/sqlite/src/util.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/util.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/util.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/util.c
diff --git a/sql/thirdparty/sqlite/src/vacuum.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vacuum.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vacuum.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vacuum.c
diff --git a/sql/thirdparty/sqlite/src/vdbe.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbe.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbe.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbe.c
diff --git a/sql/thirdparty/sqlite/src/vdbe.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbe.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbe.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbe.h
diff --git a/sql/thirdparty/sqlite/src/vdbeInt.h b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeInt.h
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbeInt.h
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeInt.h
diff --git a/sql/thirdparty/sqlite/src/vdbeapi.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeapi.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbeapi.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeapi.c
diff --git a/sql/thirdparty/sqlite/src/vdbeaux.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeaux.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbeaux.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeaux.c
diff --git a/sql/thirdparty/sqlite/src/vdbeblob.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeblob.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbeblob.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbeblob.c
diff --git a/sql/thirdparty/sqlite/src/vdbefifo.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbefifo.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbefifo.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbefifo.c
diff --git a/sql/thirdparty/sqlite/src/vdbemem.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vdbemem.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vdbemem.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vdbemem.c
diff --git a/sql/thirdparty/sqlite/src/vtab.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/vtab.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/vtab.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/vtab.c
diff --git a/sql/thirdparty/sqlite/src/where.c b/src/libs/kpunch/sql/thirdparty/sqlite/src/where.c
similarity index 100%
rename from sql/thirdparty/sqlite/src/where.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/src/where.c
diff --git a/sql/thirdparty/sqlite/tclinstaller.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tclinstaller.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tclinstaller.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tclinstaller.tcl
diff --git a/sql/thirdparty/sqlite/tool/diffdb.c b/src/libs/kpunch/sql/thirdparty/sqlite/tool/diffdb.c
similarity index 100%
rename from sql/thirdparty/sqlite/tool/diffdb.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/diffdb.c
diff --git a/sql/thirdparty/sqlite/tool/fragck.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/fragck.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/fragck.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/fragck.tcl
diff --git a/sql/thirdparty/sqlite/tool/lemon.c b/src/libs/kpunch/sql/thirdparty/sqlite/tool/lemon.c
similarity index 100%
rename from sql/thirdparty/sqlite/tool/lemon.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/lemon.c
diff --git a/sql/thirdparty/sqlite/tool/lempar.c b/src/libs/kpunch/sql/thirdparty/sqlite/tool/lempar.c
similarity index 100%
rename from sql/thirdparty/sqlite/tool/lempar.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/lempar.c
diff --git a/sql/thirdparty/sqlite/tool/memleak.awk b/src/libs/kpunch/sql/thirdparty/sqlite/tool/memleak.awk
similarity index 100%
rename from sql/thirdparty/sqlite/tool/memleak.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/memleak.awk
diff --git a/sql/thirdparty/sqlite/tool/memleak2.awk b/src/libs/kpunch/sql/thirdparty/sqlite/tool/memleak2.awk
similarity index 100%
rename from sql/thirdparty/sqlite/tool/memleak2.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/memleak2.awk
diff --git a/sql/thirdparty/sqlite/tool/memleak3.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/memleak3.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/memleak3.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/memleak3.tcl
diff --git a/sql/thirdparty/sqlite/tool/mkkeywordhash.c b/src/libs/kpunch/sql/thirdparty/sqlite/tool/mkkeywordhash.c
similarity index 100%
rename from sql/thirdparty/sqlite/tool/mkkeywordhash.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/mkkeywordhash.c
diff --git a/sql/thirdparty/sqlite/tool/mkopts.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/mkopts.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/mkopts.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/mkopts.tcl
diff --git a/sql/thirdparty/sqlite/tool/mksqlite3c.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/mksqlite3c.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/mksqlite3c.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/mksqlite3c.tcl
diff --git a/sql/thirdparty/sqlite/tool/mksqlite3internalh.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/mksqlite3internalh.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/mksqlite3internalh.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/mksqlite3internalh.tcl
diff --git a/sql/thirdparty/sqlite/tool/omittest.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/omittest.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/omittest.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/omittest.tcl
diff --git a/sql/thirdparty/sqlite/tool/opcodeDoc.awk b/src/libs/kpunch/sql/thirdparty/sqlite/tool/opcodeDoc.awk
similarity index 100%
rename from sql/thirdparty/sqlite/tool/opcodeDoc.awk
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/opcodeDoc.awk
diff --git a/sql/thirdparty/sqlite/tool/report1.txt b/src/libs/kpunch/sql/thirdparty/sqlite/tool/report1.txt
similarity index 100%
rename from sql/thirdparty/sqlite/tool/report1.txt
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/report1.txt
diff --git a/sql/thirdparty/sqlite/tool/showdb.c b/src/libs/kpunch/sql/thirdparty/sqlite/tool/showdb.c
similarity index 100%
rename from sql/thirdparty/sqlite/tool/showdb.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/showdb.c
diff --git a/sql/thirdparty/sqlite/tool/showjournal.c b/src/libs/kpunch/sql/thirdparty/sqlite/tool/showjournal.c
similarity index 100%
rename from sql/thirdparty/sqlite/tool/showjournal.c
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/showjournal.c
diff --git a/sql/thirdparty/sqlite/tool/soak1.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/soak1.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/soak1.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/soak1.tcl
diff --git a/sql/thirdparty/sqlite/tool/space_used.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/space_used.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/space_used.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/space_used.tcl
diff --git a/sql/thirdparty/sqlite/tool/spaceanal.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/spaceanal.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/spaceanal.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/spaceanal.tcl
diff --git a/sql/thirdparty/sqlite/tool/speedtest.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/speedtest.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/speedtest.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/speedtest.tcl
diff --git a/sql/thirdparty/sqlite/tool/speedtest2.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/tool/speedtest2.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/tool/speedtest2.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/tool/speedtest2.tcl
diff --git a/sql/thirdparty/sqlite/www/34to35.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/34to35.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/34to35.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/34to35.tcl
diff --git a/sql/thirdparty/sqlite/www/arch.fig b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch.fig
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch.fig
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch.fig
diff --git a/sql/thirdparty/sqlite/www/arch.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch.gif
diff --git a/sql/thirdparty/sqlite/www/arch.png b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch.png
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch.png
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch.png
diff --git a/sql/thirdparty/sqlite/www/arch.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch.tcl
diff --git a/sql/thirdparty/sqlite/www/arch2.fig b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch2.fig
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch2.fig
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch2.fig
diff --git a/sql/thirdparty/sqlite/www/arch2.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch2.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch2.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch2.gif
diff --git a/sql/thirdparty/sqlite/www/arch2b.fig b/src/libs/kpunch/sql/thirdparty/sqlite/www/arch2b.fig
similarity index 100%
rename from sql/thirdparty/sqlite/www/arch2b.fig
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/arch2b.fig
diff --git a/sql/thirdparty/sqlite/www/audit.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/audit.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/audit.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/audit.tcl
diff --git a/sql/thirdparty/sqlite/www/autoinc.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/autoinc.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/autoinc.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/autoinc.tcl
diff --git a/sql/thirdparty/sqlite/www/c_interface.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/c_interface.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/c_interface.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/c_interface.tcl
diff --git a/sql/thirdparty/sqlite/www/capi3.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/capi3.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/capi3.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/capi3.tcl
diff --git a/sql/thirdparty/sqlite/www/capi3ref.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/capi3ref.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/capi3ref.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/capi3ref.tcl
diff --git a/sql/thirdparty/sqlite/www/changes.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/changes.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/changes.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/changes.tcl
diff --git a/sql/thirdparty/sqlite/www/common.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/common.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/common.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/common.tcl
diff --git a/sql/thirdparty/sqlite/www/compile.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/compile.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/compile.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/compile.tcl
diff --git a/sql/thirdparty/sqlite/www/conflict.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/conflict.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/conflict.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/conflict.tcl
diff --git a/sql/thirdparty/sqlite/www/copyright-release.html b/src/libs/kpunch/sql/thirdparty/sqlite/www/copyright-release.html
similarity index 100%
rename from sql/thirdparty/sqlite/www/copyright-release.html
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/copyright-release.html
diff --git a/sql/thirdparty/sqlite/www/copyright-release.pdf b/src/libs/kpunch/sql/thirdparty/sqlite/www/copyright-release.pdf
similarity index 100%
rename from sql/thirdparty/sqlite/www/copyright-release.pdf
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/copyright-release.pdf
diff --git a/sql/thirdparty/sqlite/www/copyright.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/copyright.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/copyright.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/copyright.tcl
diff --git a/sql/thirdparty/sqlite/www/datatype3.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/datatype3.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/datatype3.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/datatype3.tcl
diff --git a/sql/thirdparty/sqlite/www/datatypes.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/datatypes.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/datatypes.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/datatypes.tcl
diff --git a/sql/thirdparty/sqlite/www/different.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/different.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/different.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/different.tcl
diff --git a/sql/thirdparty/sqlite/www/direct1b.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/direct1b.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/direct1b.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/direct1b.gif
diff --git a/sql/thirdparty/sqlite/www/docs.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/docs.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/docs.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/docs.tcl
diff --git a/sql/thirdparty/sqlite/www/download.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/download.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/download.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/download.tcl
diff --git a/sql/thirdparty/sqlite/www/dynload.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/dynload.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/dynload.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/dynload.tcl
diff --git a/sql/thirdparty/sqlite/www/faq.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/faq.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/faq.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/faq.tcl
diff --git a/sql/thirdparty/sqlite/www/fileformat.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/fileformat.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/fileformat.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/fileformat.tcl
diff --git a/sql/thirdparty/sqlite/www/formatchng.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/formatchng.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/formatchng.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/formatchng.tcl
diff --git a/sql/thirdparty/sqlite/www/fullscanb.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/fullscanb.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/fullscanb.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/fullscanb.gif
diff --git a/sql/thirdparty/sqlite/www/index-ex1-x-b.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/index-ex1-x-b.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/index-ex1-x-b.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/index-ex1-x-b.gif
diff --git a/sql/thirdparty/sqlite/www/index.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/index.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/index.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/index.tcl
diff --git a/sql/thirdparty/sqlite/www/indirect1b1.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/indirect1b1.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/indirect1b1.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/indirect1b1.gif
diff --git a/sql/thirdparty/sqlite/www/lang.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/lang.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/lang.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/lang.tcl
diff --git a/sql/thirdparty/sqlite/www/limits.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/limits.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/limits.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/limits.tcl
diff --git a/sql/thirdparty/sqlite/www/lockingv3.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/lockingv3.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/lockingv3.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/lockingv3.tcl
diff --git a/sql/thirdparty/sqlite/www/mingw.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/mingw.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/mingw.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/mingw.tcl
diff --git a/sql/thirdparty/sqlite/www/mkapidoc.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/mkapidoc.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/mkapidoc.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/mkapidoc.tcl
diff --git a/sql/thirdparty/sqlite/www/nulls.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/nulls.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/nulls.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/nulls.tcl
diff --git a/sql/thirdparty/sqlite/www/oldnews.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/oldnews.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/oldnews.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/oldnews.tcl
diff --git a/sql/thirdparty/sqlite/www/omitted.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/omitted.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/omitted.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/omitted.tcl
diff --git a/sql/thirdparty/sqlite/www/opcode.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/opcode.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/opcode.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/opcode.tcl
diff --git a/sql/thirdparty/sqlite/www/optimizer.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/optimizer.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/optimizer.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/optimizer.tcl
diff --git a/sql/thirdparty/sqlite/www/optimizing.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/optimizing.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/optimizing.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/optimizing.tcl
diff --git a/sql/thirdparty/sqlite/www/optoverview.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/optoverview.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/optoverview.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/optoverview.tcl
diff --git a/sql/thirdparty/sqlite/www/pragma.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/pragma.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/pragma.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/pragma.tcl
diff --git a/sql/thirdparty/sqlite/www/quickstart.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/quickstart.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/quickstart.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/quickstart.tcl
diff --git a/sql/thirdparty/sqlite/www/shared.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/shared.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/shared.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/shared.gif
diff --git a/sql/thirdparty/sqlite/www/sharedcache.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/sharedcache.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/sharedcache.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/sharedcache.tcl
diff --git a/sql/thirdparty/sqlite/www/speed.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/speed.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/speed.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/speed.tcl
diff --git a/sql/thirdparty/sqlite/www/sqlite.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/sqlite.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/sqlite.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/sqlite.tcl
diff --git a/sql/thirdparty/sqlite/www/support.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/support.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/support.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/support.tcl
diff --git a/sql/thirdparty/sqlite/www/table-ex1b2.gif b/src/libs/kpunch/sql/thirdparty/sqlite/www/table-ex1b2.gif
similarity index 100%
rename from sql/thirdparty/sqlite/www/table-ex1b2.gif
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/table-ex1b2.gif
diff --git a/sql/thirdparty/sqlite/www/tclsqlite.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/tclsqlite.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/tclsqlite.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/tclsqlite.tcl
diff --git a/sql/thirdparty/sqlite/www/vdbe.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/vdbe.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/vdbe.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/vdbe.tcl
diff --git a/sql/thirdparty/sqlite/www/version3.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/version3.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/version3.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/version3.tcl
diff --git a/sql/thirdparty/sqlite/www/whentouse.tcl b/src/libs/kpunch/sql/thirdparty/sqlite/www/whentouse.tcl
similarity index 100%
rename from sql/thirdparty/sqlite/www/whentouse.tcl
rename to src/libs/kpunch/sql/thirdparty/sqlite/www/whentouse.tcl
diff --git a/taskmgr/Makefile b/src/libs/kpunch/taskmgr/Makefile
similarity index 76%
rename from taskmgr/Makefile
rename to src/libs/kpunch/taskmgr/Makefile
index a95ecf9..74a3064 100644
--- a/taskmgr/Makefile
+++ b/src/libs/kpunch/taskmgr/Makefile
@@ -5,10 +5,10 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../core -I../core/platform -I../widgets -I../shell -I../tasks -I../core/thirdparty
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../libdvx -I../libdvx/platform -I../../../widgets/kpunch -I../dvxshell -I../libtasks -I../libdvx/thirdparty
 
-OBJDIR  = ../obj/taskmgr
-LIBSDIR = ../bin/libs
+OBJDIR  = ../../../../obj/taskmgr
+LIBSDIR = ../../../../bin/libs
 
 SRCS   = shellTaskMgr.c
 OBJS   = $(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
@@ -19,7 +19,7 @@ TARGET    = $(TARGETDIR)/taskmgr.lib
 
 all: $(TARGET) $(TARGETDIR)/taskmgr.dep
 
-$(TARGETDIR)/taskmgr.dep: ../config/taskmgr.dep | $(TARGETDIR)
+$(TARGETDIR)/taskmgr.dep: taskmgr.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(TARGET): $(OBJS) | $(TARGETDIR)
@@ -39,7 +39,7 @@ $(TARGETDIR):
 	mkdir -p $(TARGETDIR)
 
 # Dependencies
-$(OBJDIR)/shellTaskMgr.o: shellTaskMgr.c shellTaskMgr.h ../shell/shellApp.h ../core/dvxWgt.h ../core/dvxApp.h
+$(OBJDIR)/shellTaskMgr.o: shellTaskMgr.c shellTaskMgr.h ../dvxshell/shellApp.h ../libdvx/dvxWgt.h ../libdvx/dvxApp.h
 
 clean:
 	rm -rf $(OBJS) $(TARGET) $(TARGETDIR)/taskmgr.dep $(TARGETDIR)
diff --git a/taskmgr/README.md b/src/libs/kpunch/taskmgr/README.md
similarity index 100%
rename from taskmgr/README.md
rename to src/libs/kpunch/taskmgr/README.md
diff --git a/taskmgr/shellTaskMgr.c b/src/libs/kpunch/taskmgr/shellTaskMgr.c
similarity index 99%
rename from taskmgr/shellTaskMgr.c
rename to src/libs/kpunch/taskmgr/shellTaskMgr.c
index 6eecb7f..7553fdf 100644
--- a/taskmgr/shellTaskMgr.c
+++ b/src/libs/kpunch/taskmgr/shellTaskMgr.c
@@ -5,7 +5,7 @@
 // all running apps with Switch To, End Task, and Run buttons.
 
 #include "shellTaskMgr.h"
-#include "../shell/shellApp.h"
+#include "../dvxshell/shellApp.h"
 #include "dvxDlg.h"
 #include "dvxWgt.h"
 #include "box/box.h"
diff --git a/taskmgr/shellTaskMgr.h b/src/libs/kpunch/taskmgr/shellTaskMgr.h
similarity index 100%
rename from taskmgr/shellTaskMgr.h
rename to src/libs/kpunch/taskmgr/shellTaskMgr.h
diff --git a/config/taskmgr.dep b/src/libs/kpunch/taskmgr/taskmgr.dep
similarity index 100%
rename from config/taskmgr.dep
rename to src/libs/kpunch/taskmgr/taskmgr.dep
diff --git a/taskmgr/taskmgr.dhs b/src/libs/kpunch/taskmgr/taskmgr.dhs
similarity index 100%
rename from taskmgr/taskmgr.dhs
rename to src/libs/kpunch/taskmgr/taskmgr.dhs
diff --git a/texthelp/Makefile b/src/libs/kpunch/texthelp/Makefile
similarity index 75%
rename from texthelp/Makefile
rename to src/libs/kpunch/texthelp/Makefile
index 84ead97..7a3337e 100644
--- a/texthelp/Makefile
+++ b/src/libs/kpunch/texthelp/Makefile
@@ -6,10 +6,10 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I. -I../core -I../core/platform -I../tasks -I../core/thirdparty
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I. -I../libdvx -I../libdvx/platform -I../libtasks -I../libdvx/thirdparty
 
-OBJDIR  = ../obj/texthelp
-LIBSDIR = ../bin/libs
+OBJDIR  = ../../../../obj/texthelp
+LIBSDIR = ../../../../bin/libs
 
 SRCS   = textHelp.c
 OBJS   = $(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
@@ -20,7 +20,7 @@ TARGET    = $(TARGETDIR)/texthelp.lib
 
 all: $(TARGET) $(TARGETDIR)/texthelp.dep
 
-$(TARGETDIR)/texthelp.dep: ../config/texthelp.dep | $(TARGETDIR)
+$(TARGETDIR)/texthelp.dep: texthelp.dep | $(TARGETDIR)
 	sed 's/$$/\r/' $< > $@
 
 $(TARGET): $(OBJS) | $(TARGETDIR)
@@ -40,7 +40,7 @@ $(TARGETDIR):
 	mkdir -p $(TARGETDIR)
 
 # Dependencies
-$(OBJDIR)/textHelp.o: textHelp.c textHelp.h ../core/dvxWgtP.h ../core/dvxWgt.h ../core/dvxTypes.h ../core/dvxApp.h ../core/dvxDraw.h ../core/dvxWm.h ../core/dvxVideo.h
+$(OBJDIR)/textHelp.o: textHelp.c textHelp.h ../libdvx/dvxWgtP.h ../libdvx/dvxWgt.h ../libdvx/dvxTypes.h ../libdvx/dvxApp.h ../libdvx/dvxDraw.h ../libdvx/dvxWm.h ../libdvx/dvxVideo.h
 
 clean:
 	rm -rf $(OBJS) $(TARGET) $(TARGETDIR)/texthelp.dep $(TARGETDIR)
diff --git a/texthelp/README.md b/src/libs/kpunch/texthelp/README.md
similarity index 100%
rename from texthelp/README.md
rename to src/libs/kpunch/texthelp/README.md
diff --git a/texthelp/textHelp.c b/src/libs/kpunch/texthelp/textHelp.c
similarity index 100%
rename from texthelp/textHelp.c
rename to src/libs/kpunch/texthelp/textHelp.c
diff --git a/texthelp/textHelp.h b/src/libs/kpunch/texthelp/textHelp.h
similarity index 98%
rename from texthelp/textHelp.h
rename to src/libs/kpunch/texthelp/textHelp.h
index cfd3f7f..897db45 100644
--- a/texthelp/textHelp.h
+++ b/src/libs/kpunch/texthelp/textHelp.h
@@ -8,7 +8,7 @@
 #ifndef TEXT_HELP_H
 #define TEXT_HELP_H
 
-#include "../core/dvxWgtP.h"
+#include "../libdvx/dvxWgtP.h"
 
 #define TEXT_INPUT_PAD        3
 
diff --git a/config/texthelp.dep b/src/libs/kpunch/texthelp/texthelp.dep
similarity index 100%
rename from config/texthelp.dep
rename to src/libs/kpunch/texthelp/texthelp.dep
diff --git a/texthelp/texthelp.dhs b/src/libs/kpunch/texthelp/texthelp.dhs
similarity index 100%
rename from texthelp/texthelp.dhs
rename to src/libs/kpunch/texthelp/texthelp.dhs
diff --git a/loader/Makefile b/src/loader/Makefile
similarity index 54%
rename from loader/Makefile
rename to src/loader/Makefile
index abcd951..4655a27 100644
--- a/loader/Makefile
+++ b/src/loader/Makefile
@@ -9,16 +9,16 @@ DJGPP_LIBPATH = $(HOME)/claude/windriver/tools/lib
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 EXE2COFF      = $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/exe2coff
 CWSDSTUB      = $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/CWSDSTUB.EXE
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../core -I../core/platform -I../tasks -I../core/thirdparty
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../libs/kpunch/libdvx -I../libs/kpunch/libdvx/platform -I../libs/kpunch/libtasks -I../libs/kpunch/libdvx/thirdparty
 LDFLAGS       = -lm
 
-OBJDIR    = ../obj/loader
-POBJDIR   = ../obj/loader/platform
-BINDIR    = ../bin
+OBJDIR    = ../../obj/loader
+POBJDIR   = ../../obj/loader/platform
+BINDIR    = ../../bin
 
 SRCS   = loaderMain.c
 OBJS   = $(patsubst %.c,$(OBJDIR)/%.o,$(SRCS))
-POBJS  = $(POBJDIR)/dvxPlatformDos.o $(POBJDIR)/dvxPrefs.o $(OBJDIR)/dvxhlpc.o
+POBJS  = $(POBJDIR)/dvxPlatformDos.o $(POBJDIR)/dvxPlatformChdir.o $(POBJDIR)/dvxPrefs.o $(OBJDIR)/dvxhlpc.o
 TARGET = $(BINDIR)/dvx.exe
 
 .PHONY: all clean
@@ -34,13 +34,16 @@ $(TARGET): $(OBJS) $(POBJS) | $(BINDIR)
 $(OBJDIR)/%.o: %.c | $(OBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(POBJDIR)/dvxPlatformDos.o: ../core/platform/dvxPlatformDos.c | $(POBJDIR)
+$(POBJDIR)/dvxPlatformDos.o: ../libs/kpunch/libdvx/platform/dvxPlatformDos.c | $(POBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(POBJDIR)/dvxPrefs.o: ../core/dvxPrefs.c | $(POBJDIR)
+$(POBJDIR)/dvxPlatformChdir.o: ../libs/kpunch/libdvx/platform/dvxPlatformChdir.c | $(POBJDIR)
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJDIR)/dvxhlpc.o: ../tools/dvxhlpc.c ../tools/hlpcCompile.h ../apps/dvxhelp/hlpformat.h | $(OBJDIR)
+$(POBJDIR)/dvxPrefs.o: ../libs/kpunch/libdvx/dvxPrefs.c | $(POBJDIR)
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJDIR)/dvxhlpc.o: ../tools/dvxhlpc.c ../tools/hlpcCompile.h ../apps/kpunch/dvxhelp/hlpformat.h | $(OBJDIR)
 	$(CC) $(CFLAGS) -DHLPC_NO_MAIN -c -o $@ ../tools/dvxhlpc.c
 
 $(OBJDIR):
@@ -53,9 +56,10 @@ $(BINDIR):
 	mkdir -p $(BINDIR)
 
 # Dependencies
-$(OBJDIR)/loaderMain.o: loaderMain.c ../core/platform/dvxPlat.h ../core/dvxTypes.h
-$(POBJDIR)/dvxPlatformDos.o: ../core/platform/dvxPlatformDos.c ../core/platform/dvxPlat.h ../core/dvxTypes.h ../core/dvxPal.h
-$(POBJDIR)/dvxPrefs.o: ../core/dvxPrefs.c ../core/dvxPrefs.h
+$(OBJDIR)/loaderMain.o: loaderMain.c ../libs/kpunch/libdvx/platform/dvxPlat.h ../libs/kpunch/libdvx/dvxTypes.h
+$(POBJDIR)/dvxPlatformDos.o: ../libs/kpunch/libdvx/platform/dvxPlatformDos.c ../libs/kpunch/libdvx/platform/dvxPlat.h ../libs/kpunch/libdvx/dvxTypes.h ../libs/kpunch/libdvx/dvxPal.h
+$(POBJDIR)/dvxPlatformChdir.o: ../libs/kpunch/libdvx/platform/dvxPlatformChdir.c ../libs/kpunch/libdvx/platform/dvxPlat.h ../libs/kpunch/libdvx/dvxTypes.h
+$(POBJDIR)/dvxPrefs.o: ../libs/kpunch/libdvx/dvxPrefs.c ../libs/kpunch/libdvx/dvxPrefs.h
 
 clean:
 	rm -f $(OBJS) $(POBJS) $(TARGET) $(BINDIR)/dvx.map
diff --git a/loader/README.md b/src/loader/README.md
similarity index 100%
rename from loader/README.md
rename to src/loader/README.md
diff --git a/loader/loaderMain.c b/src/loader/loaderMain.c
similarity index 93%
rename from loader/loaderMain.c
rename to src/loader/loaderMain.c
index 784f763..874f9fa 100644
--- a/loader/loaderMain.c
+++ b/src/loader/loaderMain.c
@@ -128,6 +128,7 @@ static void     logAndReadDeps(ModuleT *mods);
 static void     processHcfDir(const char *dirPath);
 static void     readDeps(ModuleT *mod);
 static void     scanDir(const char *dirPath, const char *ext, ModuleT **mods);
+static void     validateDeps(const ModuleT *libs, const ModuleT *widgets);
 
 // ============================================================
 // extractBaseName -- strip directory and extension, lowercase
@@ -303,6 +304,56 @@ static bool allDepsLoaded(const ModuleT *mod, const ModuleT *mods) {
 }
 
 
+// ============================================================
+// validateDeps -- abort if any .dep line points at a missing module
+// ============================================================
+//
+// allDepsLoaded silently treats an unknown dep name as "external, assumed
+// OK" so that libc / platform symbols don't trip the topological sort.
+// That's fine for intentional externals but masks typos and missing
+// .lib/.wgt files.  This pre-flight check ensures every name in any .dep
+// resolves to a module we actually discovered; anything else is fatal.
+
+static void validateDeps(const ModuleT *libs, const ModuleT *widgets) {
+    const ModuleT *pools[2] = { libs, widgets };
+    const char    *kinds[2] = { "lib", "widget" };
+    int32_t        errors   = 0;
+
+    for (int32_t pi = 0; pi < 2; pi++) {
+        const ModuleT *mods = pools[pi];
+
+        for (int32_t i = 0; i < arrlen(mods); i++) {
+            for (int32_t d = 0; d < arrlen(mods[i].deps); d++) {
+                const char *depName = mods[i].deps[d];
+                bool        found   = false;
+
+                for (int32_t qi = 0; qi < 2 && !found; qi++) {
+                    const ModuleT *pool = pools[qi];
+
+                    for (int32_t j = 0; j < arrlen(pool); j++) {
+                        if (strcasecmp(pool[j].baseName, depName) == 0) {
+                            found = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (!found) {
+                    dvxLog("FATAL: %s %s requires missing dep: %s", kinds[pi], mods[i].baseName, depName);
+                    fprintf(stderr, "FATAL: %s %s requires missing dep: %s\n", kinds[pi], mods[i].baseName, depName);
+                    errors++;
+                }
+            }
+        }
+    }
+
+    if (errors > 0) {
+        fprintf(stderr, "%d unresolved dependency reference(s); aborting.\n", (int)errors);
+        exit(1);
+    }
+}
+
+
 // ============================================================
 // loadInOrder -- topological sort and load
 // ============================================================
@@ -912,6 +963,9 @@ static void **loadAllModules(void) {
     sWidgetCount = (int32_t)arrlen(widgets);
     sSplashTotal = sLibCount + sWidgetCount;
 
+    // Abort early on typos or missing prerequisite .lib/.wgt files.
+    validateDeps(libs, widgets);
+
     // Phase 1: load libraries in dependency order
     loadInOrder(libs);
 
diff --git a/tools/Makefile b/src/tools/Makefile
similarity index 61%
rename from tools/Makefile
rename to src/tools/Makefile
index 228763c..09bc36b 100644
--- a/tools/Makefile
+++ b/src/tools/Makefile
@@ -3,25 +3,25 @@
 # Builds native (host) utilities and cross-compiled DOS tools.
 
 CC      = gcc
-CFLAGS  = -O2 -Wall -Wextra -Werror -Wno-format-truncation -I../core -I../core/platform
+CFLAGS  = -O2 -Wall -Wextra -Werror -Wno-format-truncation -I../libs/kpunch/libdvx -I../libs/kpunch/libdvx/platform
 
 DJGPP_PREFIX = $(HOME)/djgpp/djgpp
 DOSCC        = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 EXE2COFF     = $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/exe2coff
 CWSDSTUB     = $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/CWSDSTUB.EXE
-DOSCFLAGS    = -O2 -Wall -Wextra -Werror -Wno-format-truncation -march=i486 -mtune=i586 -I../core -I../core/platform
+DOSCFLAGS    = -O2 -Wall -Wextra -Werror -Wno-format-truncation -march=i486 -mtune=i586 -I../libs/kpunch/libdvx -I../libs/kpunch/libdvx/platform
 
-BINDIR    = ../bin
-HOSTDIR   = ../bin/host
-CONFIGDIR = ../bin/config
-SYSTEMDIR = ../bin/system
+BINDIR    = ../../bin
+HOSTDIR   = ../../bin/host
+CONFIGDIR = ../../bin/config
+SYSTEMDIR = ../../bin/system
 
 .PHONY: all clean deploy-helpsrc
 
 all: $(HOSTDIR)/dvxres $(HOSTDIR)/mkicon $(HOSTDIR)/mktbicon $(HOSTDIR)/mkwgticon $(HOSTDIR)/bmp2raw $(HOSTDIR)/dvxhlpc $(SYSTEMDIR)/SPLASH.RAW $(SYSTEMDIR)/DVXHLPC.EXE $(SYSTEMDIR)/DVXRES.EXE
 
-$(HOSTDIR)/dvxres: dvxres.c ../core/dvxResource.c ../core/dvxRes.h | $(HOSTDIR)
-	$(CC) $(CFLAGS) -o $@ dvxres.c ../core/dvxResource.c
+$(HOSTDIR)/dvxres: dvxres.c ../libs/kpunch/libdvx/dvxResource.c ../libs/kpunch/libdvx/dvxRes.h | $(HOSTDIR)
+	$(CC) $(CFLAGS) -o $@ dvxres.c ../libs/kpunch/libdvx/dvxResource.c
 
 $(HOSTDIR)/mkicon: mkicon.c | $(HOSTDIR)
 	$(CC) $(CFLAGS) -o $@ mkicon.c -lm
@@ -35,14 +35,14 @@ $(HOSTDIR)/mkwgticon: mkwgticon.c | $(HOSTDIR)
 $(HOSTDIR)/bmp2raw: bmp2raw.c | $(HOSTDIR)
 	$(CC) $(CFLAGS) -o $@ bmp2raw.c
 
-$(HOSTDIR)/dvxhlpc: dvxhlpc.c ../apps/dvxhelp/hlpformat.h | $(HOSTDIR)
+$(HOSTDIR)/dvxhlpc: dvxhlpc.c ../apps/kpunch/dvxhelp/hlpformat.h | $(HOSTDIR)
 	$(CC) $(CFLAGS) -o $@ dvxhlpc.c
 
 $(HOSTDIR):
 	mkdir -p $(HOSTDIR)
 
-$(SYSTEMDIR)/SPLASH.RAW: $(HOSTDIR)/bmp2raw ../assets/splash.bmp | $(SYSTEMDIR)
-	$(HOSTDIR)/bmp2raw ../assets/splash.bmp $@
+$(SYSTEMDIR)/SPLASH.RAW: $(HOSTDIR)/bmp2raw ../../assets/splash.bmp | $(SYSTEMDIR)
+	$(HOSTDIR)/bmp2raw ../../assets/splash.bmp $@
 
 $(BINDIR):
 	mkdir -p $(BINDIR)
@@ -50,21 +50,21 @@ $(BINDIR):
 $(CONFIGDIR):
 	mkdir -p $(CONFIGDIR)
 
-$(SYSTEMDIR)/DVXHLPC.EXE: dvxhlpc.c hlpcCompile.h ../apps/dvxhelp/hlpformat.h | $(SYSTEMDIR)
+$(SYSTEMDIR)/DVXHLPC.EXE: dvxhlpc.c hlpcCompile.h ../apps/kpunch/dvxhelp/hlpformat.h | $(SYSTEMDIR)
 	$(DOSCC) $(DOSCFLAGS) -o $(SYSTEMDIR)/dvxhlpc.exe dvxhlpc.c
 	$(EXE2COFF) $(SYSTEMDIR)/dvxhlpc.exe
 	cat $(CWSDSTUB) $(SYSTEMDIR)/dvxhlpc > $@
 	rm -f $(SYSTEMDIR)/dvxhlpc $(SYSTEMDIR)/dvxhlpc.exe
 
 # Object file for linking into the loader (no main)
-../obj/loader/dvxhlpc.o: dvxhlpc.c hlpcCompile.h ../apps/dvxhelp/hlpformat.h | ../obj/loader
+../../obj/loader/dvxhlpc.o: dvxhlpc.c hlpcCompile.h ../apps/kpunch/dvxhelp/hlpformat.h | ../../obj/loader
 	$(DOSCC) $(DOSCFLAGS) -DHLPC_NO_MAIN -c -o $@ dvxhlpc.c
 
-../obj/loader:
-	mkdir -p ../obj/loader
+../../obj/loader:
+	mkdir -p ../../obj/loader
 
-$(SYSTEMDIR)/DVXRES.EXE: dvxres.c ../core/dvxResource.c ../core/dvxRes.h | $(SYSTEMDIR)
-	$(DOSCC) $(DOSCFLAGS) -o $(SYSTEMDIR)/dvxres.exe dvxres.c ../core/dvxResource.c
+$(SYSTEMDIR)/DVXRES.EXE: dvxres.c ../libs/kpunch/libdvx/dvxResource.c ../libs/kpunch/libdvx/dvxRes.h | $(SYSTEMDIR)
+	$(DOSCC) $(DOSCFLAGS) -o $(SYSTEMDIR)/dvxres.exe dvxres.c ../libs/kpunch/libdvx/dvxResource.c
 	$(EXE2COFF) $(SYSTEMDIR)/dvxres.exe
 	cat $(CWSDSTUB) $(SYSTEMDIR)/dvxres > $@
 	rm -f $(SYSTEMDIR)/dvxres $(SYSTEMDIR)/dvxres.exe
@@ -75,21 +75,21 @@ $(SYSTEMDIR):
 deploy-helpsrc:
 	@echo "Deploying help source files..."
 	@# Deploy help images from core/
-	@for f in ../core/*.png; do \
+	@for f in ../libs/kpunch/libdvx/*.png; do \
 		[ -f "$$f" ] || continue; \
 		name=$$(basename "$$f" | tr a-z A-Z); \
 		cp "$$f" $(BINDIR)/libs/kpunch/libdvx/"$$name"; \
 	done
 	@for pair in \
-		"../core/*.dhs:$(BINDIR)/libs/kpunch/libdvx" \
-		"../tasks/*.dhs:$(BINDIR)/libs/kpunch/libtasks" \
-		"../shell/*.dhs:$(BINDIR)/libs/kpunch/dvxshell" \
-		"../sql/*.dhs:$(BINDIR)/libs/kpunch/dvxsql" \
-		"../texthelp/*.dhs:$(BINDIR)/libs/kpunch/texthelp" \
-		"../listhelp/*.dhs:$(BINDIR)/libs/kpunch/listhelp" \
-		"../taskmgr/*.dhs:$(BINDIR)/libs/kpunch/taskmgr" \
-		"../serial/*.dhs:$(BINDIR)/libs/kpunch/serial" \
-		"../apps/dvxbasic/basrt.dhs:$(BINDIR)/libs/kpunch/basrt" \
+		"../libs/kpunch/libdvx/*.dhs:$(BINDIR)/libs/kpunch/libdvx" \
+		"../libs/kpunch/libtasks/*.dhs:$(BINDIR)/libs/kpunch/libtasks" \
+		"../libs/kpunch/dvxshell/*.dhs:$(BINDIR)/libs/kpunch/dvxshell" \
+		"../libs/kpunch/sql/*.dhs:$(BINDIR)/libs/kpunch/dvxsql" \
+		"../libs/kpunch/texthelp/*.dhs:$(BINDIR)/libs/kpunch/texthelp" \
+		"../libs/kpunch/listhelp/*.dhs:$(BINDIR)/libs/kpunch/listhelp" \
+		"../libs/kpunch/taskmgr/*.dhs:$(BINDIR)/libs/kpunch/taskmgr" \
+		"../libs/kpunch/serial/*.dhs:$(BINDIR)/libs/kpunch/serial" \
+		"../apps/kpunch/dvxbasic/basrt.dhs:$(BINDIR)/libs/kpunch/basrt" \
 	; do \
 		src=$${pair%%:*}; dst=$${pair##*:}; \
 		for f in $$src; do \
@@ -98,12 +98,12 @@ deploy-helpsrc:
 			cp "$$f" "$$dst"/"$$name"; \
 		done; \
 	done
-	@for f in ../widgets/*.dhs; do \
+	@for f in ../widgets/kpunch/kpunch/*.dhs; do \
 		[ -f "$$f" ] || continue; \
 		name=$$(basename "$$f" | tr a-z A-Z); \
 		cp "$$f" $(BINDIR)/widgets/kpunch/"$$name"; \
 	done
-	@for d in ../widgets/*/; do \
+	@for d in ../widgets/kpunch/kpunch/*/; do \
 		for f in "$$d"*.dhs "$$d"*.bhs; do \
 			[ -f "$$f" ] || continue; \
 			name=$$(basename "$$f" | tr a-z A-Z); \
@@ -115,18 +115,18 @@ deploy-helpsrc:
 			fi; \
 		done; \
 	done
-	@for f in ../apps/dvxbasic/*.dhs; do \
+	@for f in ../apps/kpunch/dvxbasic/*.dhs; do \
 		[ -f "$$f" ] || continue; \
 		name=$$(basename "$$f" | tr a-z A-Z); \
 		cp "$$f" $(BINDIR)/apps/kpunch/dvxbasic/"$$name"; \
 	done
-	@for f in ../apps/dvxhelp/*.dhs; do \
+	@for f in ../apps/kpunch/dvxhelp/*.dhs; do \
 		[ -f "$$f" ] || continue; \
 		name=$$(basename "$$f" | tr a-z A-Z); \
 		cp "$$f" $(BINDIR)/apps/kpunch/dvxhelp/"$$name"; \
 	done
 	@echo "Deploying help config files..."
-	@for d in ../apps/*/; do \
+	@for d in ../apps/kpunch/*/; do \
 		for f in "$$d"*.hcf; do \
 			[ -f "$$f" ] || continue; \
 			appdir=$$(basename "$$d"); \
diff --git a/tools/README.md b/src/tools/README.md
similarity index 100%
rename from tools/README.md
rename to src/tools/README.md
diff --git a/tools/bmp2raw.c b/src/tools/bmp2raw.c
similarity index 100%
rename from tools/bmp2raw.c
rename to src/tools/bmp2raw.c
diff --git a/tools/dvxResWrite.h b/src/tools/dvxResWrite.h
similarity index 99%
rename from tools/dvxResWrite.h
rename to src/tools/dvxResWrite.h
index 9893fc3..9bdd7e9 100644
--- a/tools/dvxResWrite.h
+++ b/src/tools/dvxResWrite.h
@@ -10,7 +10,7 @@
 #ifndef DVX_RES_WRITE_H
 #define DVX_RES_WRITE_H
 
-#include "../core/dvxRes.h"
+#include "../libs/kpunch/libdvx/dvxRes.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/dvxhlpc.c b/src/tools/dvxhlpc.c
similarity index 99%
rename from tools/dvxhlpc.c
rename to src/tools/dvxhlpc.c
index 0fa0ec8..d91a519 100644
--- a/tools/dvxhlpc.c
+++ b/src/tools/dvxhlpc.c
@@ -16,7 +16,7 @@
 #define _POSIX_C_SOURCE 200809L
 
 #include "hlpcCompile.h"
-#include "../apps/dvxhelp/hlpformat.h"
+#include "../apps/kpunch/dvxhelp/hlpformat.h"
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/tools/dvxres.c b/src/tools/dvxres.c
similarity index 100%
rename from tools/dvxres.c
rename to src/tools/dvxres.c
diff --git a/tools/hlpcCompile.h b/src/tools/hlpcCompile.h
similarity index 100%
rename from tools/hlpcCompile.h
rename to src/tools/hlpcCompile.h
diff --git a/tools/mkicon.c b/src/tools/mkicon.c
similarity index 100%
rename from tools/mkicon.c
rename to src/tools/mkicon.c
diff --git a/tools/mktbicon.c b/src/tools/mktbicon.c
similarity index 100%
rename from tools/mktbicon.c
rename to src/tools/mktbicon.c
diff --git a/tools/mkwgticon.c b/src/tools/mkwgticon.c
similarity index 100%
rename from tools/mkwgticon.c
rename to src/tools/mkwgticon.c
diff --git a/proxy/Makefile b/src/tools/proxy/Makefile
similarity index 100%
rename from proxy/Makefile
rename to src/tools/proxy/Makefile
diff --git a/proxy/README.md b/src/tools/proxy/README.md
similarity index 100%
rename from proxy/README.md
rename to src/tools/proxy/README.md
diff --git a/proxy/proxy.c b/src/tools/proxy/proxy.c
similarity index 100%
rename from proxy/proxy.c
rename to src/tools/proxy/proxy.c
diff --git a/proxy/sockShim.c b/src/tools/proxy/sockShim.c
similarity index 100%
rename from proxy/sockShim.c
rename to src/tools/proxy/sockShim.c
diff --git a/proxy/sockShim.h b/src/tools/proxy/sockShim.h
similarity index 100%
rename from proxy/sockShim.h
rename to src/tools/proxy/sockShim.h
diff --git a/proxy/stubs/go32.h b/src/tools/proxy/stubs/go32.h
similarity index 100%
rename from proxy/stubs/go32.h
rename to src/tools/proxy/stubs/go32.h
diff --git a/proxy/stubs/pc.h b/src/tools/proxy/stubs/pc.h
similarity index 100%
rename from proxy/stubs/pc.h
rename to src/tools/proxy/stubs/pc.h
diff --git a/proxy/stubs/sys/farptr.h b/src/tools/proxy/stubs/sys/farptr.h
similarity index 100%
rename from proxy/stubs/sys/farptr.h
rename to src/tools/proxy/stubs/sys/farptr.h
diff --git a/widgets/Makefile b/src/widgets/kpunch/Makefile
similarity index 75%
rename from widgets/Makefile
rename to src/widgets/kpunch/Makefile
index 278db4c..a0fa0b8 100644
--- a/widgets/Makefile
+++ b/src/widgets/kpunch/Makefile
@@ -6,11 +6,11 @@
 DJGPP_PREFIX  = $(HOME)/djgpp/djgpp
 CC            = $(DJGPP_PREFIX)/bin/i586-pc-msdosdjgpp-gcc
 DXE3GEN       = PATH=$(DJGPP_PREFIX)/bin:$(PATH) DJDIR=$(DJGPP_PREFIX)/i586-pc-msdosdjgpp $(DJGPP_PREFIX)/i586-pc-msdosdjgpp/bin/dxe3gen
-CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../core -I../core/platform -I../tasks -I../core/thirdparty
-DVXRES        = ../bin/host/dvxres
+CFLAGS        = -O2 -Wall -Wextra -Werror -Wno-type-limits -Wno-sign-compare -Wno-format-truncation -march=i486 -mtune=i586 -I../../libs/kpunch/libdvx -I../../libs/kpunch/libdvx/platform -I../../libs/kpunch/libtasks -I../../libs/kpunch/libdvx/thirdparty
+DVXRES        = ../../../bin/host/dvxres
 
-OBJDIR = ../obj/widgets
-WGTDIR = ../bin/widgets/kpunch
+OBJDIR = ../../../obj/widgets
+WGTDIR = ../../../bin/widgets/kpunch
 
 # Widget name -> directory, source, short name for .wgt/.res
 # Format: wgtShortName:dirName:srcFile:resFile
@@ -52,22 +52,23 @@ OBJS      = $(foreach w,$(WIDGETS),$(OBJDIR)/$(word 3,$(subst :, ,$w)).o)
 
 # Per-widget extra DXE3GEN flags (e.g. additional -E exports for dlsym)
 
-DEPFILES = textinpt combobox spinner terminal listbox dropdown listview treeview
-WGT_DEPS = $(foreach d,$(DEPFILES),$(WGTDIR)/$(d)/$(d).dep)
+# shortName:srcDir pairs -- srcDir holds the .dep source file
+DEPFILES = textinpt:textInput combobox:comboBox spinner:spinner terminal:ansiTerm listbox:listBox dropdown:dropdown listview:listView treeview:treeView
+WGT_DEPS = $(foreach d,$(DEPFILES),$(WGTDIR)/$(word 1,$(subst :, ,$(d)))/$(word 1,$(subst :, ,$(d))).dep)
 
 .PHONY: all clean
 
 all: $(WGT_MODS) $(WGT_DEPS)
 
 define DEP_RULE
-$(WGTDIR)/$(1)/$(1).dep: ../config/$(1).dep | $(WGTDIR)/$(1)
+$(WGTDIR)/$(word 1,$(subst :, ,$(1)))/$(word 1,$(subst :, ,$(1))).dep: $(word 2,$(subst :, ,$(1)))/$(word 1,$(subst :, ,$(1))).dep | $(WGTDIR)/$(word 1,$(subst :, ,$(1)))
 	cp $$< $$@
 endef
 
 $(foreach d,$(DEPFILES),$(eval $(call DEP_RULE,$(d))))
 
 # Compile: source is in subdirectory
-WIDGET_DEPS_H = ../core/dvxWgtP.h ../core/dvxWgt.h ../core/dvxTypes.h ../core/dvxApp.h ../core/dvxDraw.h ../core/dvxWm.h ../core/dvxVideo.h ../core/platform/dvxPlat.h
+WIDGET_DEPS_H = ../../libs/kpunch/libdvx/dvxWgtP.h ../../libs/kpunch/libdvx/dvxWgt.h ../../libs/kpunch/libdvx/dvxTypes.h ../../libs/kpunch/libdvx/dvxApp.h ../../libs/kpunch/libdvx/dvxDraw.h ../../libs/kpunch/libdvx/dvxWm.h ../../libs/kpunch/libdvx/dvxVideo.h ../../libs/kpunch/libdvx/platform/dvxPlat.h
 
 define WIDGET_RULES
 $(OBJDIR)/$(word 3,$(subst :, ,$1)).o: $(word 2,$(subst :, ,$1))/$(word 3,$(subst :, ,$1)).c $$(WIDGET_DEPS_H) | $(OBJDIR)
diff --git a/widgets/README.md b/src/widgets/kpunch/README.md
similarity index 100%
rename from widgets/README.md
rename to src/widgets/kpunch/README.md
diff --git a/widgets/ansiTerm/ansiTerm.dhs b/src/widgets/kpunch/ansiTerm/ansiTerm.dhs
similarity index 100%
rename from widgets/ansiTerm/ansiTerm.dhs
rename to src/widgets/kpunch/ansiTerm/ansiTerm.dhs
diff --git a/widgets/ansiTerm/ansiTerm.h b/src/widgets/kpunch/ansiTerm/ansiTerm.h
similarity index 96%
rename from widgets/ansiTerm/ansiTerm.h
rename to src/widgets/kpunch/ansiTerm/ansiTerm.h
index 0278421..48f1587 100644
--- a/widgets/ansiTerm/ansiTerm.h
+++ b/src/widgets/kpunch/ansiTerm/ansiTerm.h
@@ -2,7 +2,7 @@
 #ifndef ANSITERM_H
 #define ANSITERM_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, int32_t cols, int32_t rows);
diff --git a/widgets/ansiTerm/ansiterm.bhs b/src/widgets/kpunch/ansiTerm/ansiterm.bhs
similarity index 100%
rename from widgets/ansiTerm/ansiterm.bhs
rename to src/widgets/kpunch/ansiTerm/ansiterm.bhs
diff --git a/widgets/ansiTerm/terminal.bmp b/src/widgets/kpunch/ansiTerm/terminal.bmp
similarity index 100%
rename from widgets/ansiTerm/terminal.bmp
rename to src/widgets/kpunch/ansiTerm/terminal.bmp
diff --git a/config/terminal.dep b/src/widgets/kpunch/ansiTerm/terminal.dep
similarity index 100%
rename from config/terminal.dep
rename to src/widgets/kpunch/ansiTerm/terminal.dep
diff --git a/widgets/ansiTerm/terminal.res b/src/widgets/kpunch/ansiTerm/terminal.res
similarity index 100%
rename from widgets/ansiTerm/terminal.res
rename to src/widgets/kpunch/ansiTerm/terminal.res
diff --git a/widgets/ansiTerm/widgetAnsiTerm.c b/src/widgets/kpunch/ansiTerm/widgetAnsiTerm.c
similarity index 99%
rename from widgets/ansiTerm/widgetAnsiTerm.c
rename to src/widgets/kpunch/ansiTerm/widgetAnsiTerm.c
index c86de02..21ec7d1 100644
--- a/widgets/ansiTerm/widgetAnsiTerm.c
+++ b/src/widgets/kpunch/ansiTerm/widgetAnsiTerm.c
@@ -37,7 +37,7 @@
 // or any other byte-oriented transport.
 
 #include "dvxWgtP.h"
-#include "../texthelp/textHelp.h"
+#include "../../../libs/kpunch/texthelp/textHelp.h"
 
 static int32_t sTypeId = -1;
 
diff --git a/widgets/box/box.bhs b/src/widgets/kpunch/box/box.bhs
similarity index 100%
rename from widgets/box/box.bhs
rename to src/widgets/kpunch/box/box.bhs
diff --git a/widgets/box/box.bmp b/src/widgets/kpunch/box/box.bmp
similarity index 100%
rename from widgets/box/box.bmp
rename to src/widgets/kpunch/box/box.bmp
diff --git a/widgets/box/box.dhs b/src/widgets/kpunch/box/box.dhs
similarity index 100%
rename from widgets/box/box.dhs
rename to src/widgets/kpunch/box/box.dhs
diff --git a/widgets/box/box.h b/src/widgets/kpunch/box/box.h
similarity index 92%
rename from widgets/box/box.h
rename to src/widgets/kpunch/box/box.h
index e4cbe67..0fd9d9d 100644
--- a/widgets/box/box.h
+++ b/src/widgets/kpunch/box/box.h
@@ -2,7 +2,7 @@
 #ifndef BOX_H
 #define BOX_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*vBox)(WidgetT *parent);
diff --git a/widgets/box/box.res b/src/widgets/kpunch/box/box.res
similarity index 100%
rename from widgets/box/box.res
rename to src/widgets/kpunch/box/box.res
diff --git a/widgets/box/widgetBox.c b/src/widgets/kpunch/box/widgetBox.c
similarity index 100%
rename from widgets/box/widgetBox.c
rename to src/widgets/kpunch/box/widgetBox.c
diff --git a/widgets/button/button.bhs b/src/widgets/kpunch/button/button.bhs
similarity index 100%
rename from widgets/button/button.bhs
rename to src/widgets/kpunch/button/button.bhs
diff --git a/widgets/button/button.bmp b/src/widgets/kpunch/button/button.bmp
similarity index 100%
rename from widgets/button/button.bmp
rename to src/widgets/kpunch/button/button.bmp
diff --git a/widgets/button/button.dhs b/src/widgets/kpunch/button/button.dhs
similarity index 100%
rename from widgets/button/button.dhs
rename to src/widgets/kpunch/button/button.dhs
diff --git a/widgets/button/button.h b/src/widgets/kpunch/button/button.h
similarity index 89%
rename from widgets/button/button.h
rename to src/widgets/kpunch/button/button.h
index 454e08c..0bbf4b3 100644
--- a/widgets/button/button.h
+++ b/src/widgets/kpunch/button/button.h
@@ -2,7 +2,7 @@
 #ifndef BUTTON_H
 #define BUTTON_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, const char *text);
diff --git a/widgets/button/button.res b/src/widgets/kpunch/button/button.res
similarity index 100%
rename from widgets/button/button.res
rename to src/widgets/kpunch/button/button.res
diff --git a/widgets/button/widgetButton.c b/src/widgets/kpunch/button/widgetButton.c
similarity index 100%
rename from widgets/button/widgetButton.c
rename to src/widgets/kpunch/button/widgetButton.c
diff --git a/widgets/canvas/canvas.bhs b/src/widgets/kpunch/canvas/canvas.bhs
similarity index 100%
rename from widgets/canvas/canvas.bhs
rename to src/widgets/kpunch/canvas/canvas.bhs
diff --git a/widgets/canvas/canvas.bmp b/src/widgets/kpunch/canvas/canvas.bmp
similarity index 100%
rename from widgets/canvas/canvas.bmp
rename to src/widgets/kpunch/canvas/canvas.bmp
diff --git a/widgets/canvas/canvas.dhs b/src/widgets/kpunch/canvas/canvas.dhs
similarity index 100%
rename from widgets/canvas/canvas.dhs
rename to src/widgets/kpunch/canvas/canvas.dhs
diff --git a/widgets/canvas/canvas.h b/src/widgets/kpunch/canvas/canvas.h
similarity index 98%
rename from widgets/canvas/canvas.h
rename to src/widgets/kpunch/canvas/canvas.h
index 7dcd476..793a825 100644
--- a/widgets/canvas/canvas.h
+++ b/src/widgets/kpunch/canvas/canvas.h
@@ -2,7 +2,7 @@
 #ifndef CANVAS_H
 #define CANVAS_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT  *(*create)(WidgetT *parent, int32_t w, int32_t h);
diff --git a/widgets/canvas/canvas.res b/src/widgets/kpunch/canvas/canvas.res
similarity index 100%
rename from widgets/canvas/canvas.res
rename to src/widgets/kpunch/canvas/canvas.res
diff --git a/widgets/canvas/widgetCanvas.c b/src/widgets/kpunch/canvas/widgetCanvas.c
similarity index 100%
rename from widgets/canvas/widgetCanvas.c
rename to src/widgets/kpunch/canvas/widgetCanvas.c
diff --git a/widgets/checkbox/checkbox.bhs b/src/widgets/kpunch/checkbox/checkbox.bhs
similarity index 100%
rename from widgets/checkbox/checkbox.bhs
rename to src/widgets/kpunch/checkbox/checkbox.bhs
diff --git a/widgets/checkbox/checkbox.bmp b/src/widgets/kpunch/checkbox/checkbox.bmp
similarity index 100%
rename from widgets/checkbox/checkbox.bmp
rename to src/widgets/kpunch/checkbox/checkbox.bmp
diff --git a/widgets/checkbox/checkbox.dhs b/src/widgets/kpunch/checkbox/checkbox.dhs
similarity index 100%
rename from widgets/checkbox/checkbox.dhs
rename to src/widgets/kpunch/checkbox/checkbox.dhs
diff --git a/widgets/checkbox/checkbox.h b/src/widgets/kpunch/checkbox/checkbox.h
similarity index 93%
rename from widgets/checkbox/checkbox.h
rename to src/widgets/kpunch/checkbox/checkbox.h
index 27c3a06..2e699f5 100644
--- a/widgets/checkbox/checkbox.h
+++ b/src/widgets/kpunch/checkbox/checkbox.h
@@ -2,7 +2,7 @@
 #ifndef CHECKBOX_H
 #define CHECKBOX_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, const char *text);
diff --git a/widgets/checkbox/checkbox.res b/src/widgets/kpunch/checkbox/checkbox.res
similarity index 100%
rename from widgets/checkbox/checkbox.res
rename to src/widgets/kpunch/checkbox/checkbox.res
diff --git a/widgets/checkbox/widgetCheckbox.c b/src/widgets/kpunch/checkbox/widgetCheckbox.c
similarity index 100%
rename from widgets/checkbox/widgetCheckbox.c
rename to src/widgets/kpunch/checkbox/widgetCheckbox.c
diff --git a/widgets/comboBox/comboBox.dhs b/src/widgets/kpunch/comboBox/comboBox.dhs
similarity index 100%
rename from widgets/comboBox/comboBox.dhs
rename to src/widgets/kpunch/comboBox/comboBox.dhs
diff --git a/widgets/comboBox/comboBox.h b/src/widgets/kpunch/comboBox/comboBox.h
similarity index 96%
rename from widgets/comboBox/comboBox.h
rename to src/widgets/kpunch/comboBox/comboBox.h
index 8576861..0ea20ed 100644
--- a/widgets/comboBox/comboBox.h
+++ b/src/widgets/kpunch/comboBox/comboBox.h
@@ -2,7 +2,7 @@
 #ifndef COMBOBOX_H
 #define COMBOBOX_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, int32_t maxLen);
diff --git a/widgets/comboBox/combobox.bhs b/src/widgets/kpunch/comboBox/combobox.bhs
similarity index 100%
rename from widgets/comboBox/combobox.bhs
rename to src/widgets/kpunch/comboBox/combobox.bhs
diff --git a/widgets/comboBox/combobox.bmp b/src/widgets/kpunch/comboBox/combobox.bmp
similarity index 100%
rename from widgets/comboBox/combobox.bmp
rename to src/widgets/kpunch/comboBox/combobox.bmp
diff --git a/config/combobox.dep b/src/widgets/kpunch/comboBox/combobox.dep
similarity index 100%
rename from config/combobox.dep
rename to src/widgets/kpunch/comboBox/combobox.dep
diff --git a/widgets/comboBox/combobox.res b/src/widgets/kpunch/comboBox/combobox.res
similarity index 100%
rename from widgets/comboBox/combobox.res
rename to src/widgets/kpunch/comboBox/combobox.res
diff --git a/widgets/comboBox/widgetComboBox.c b/src/widgets/kpunch/comboBox/widgetComboBox.c
similarity index 99%
rename from widgets/comboBox/widgetComboBox.c
rename to src/widgets/kpunch/comboBox/widgetComboBox.c
index 1f9346b..f7584ba 100644
--- a/widgets/comboBox/widgetComboBox.c
+++ b/src/widgets/kpunch/comboBox/widgetComboBox.c
@@ -22,8 +22,8 @@
 // is tracked via the sDragWidget global.
 
 #include "dvxWgtP.h"
-#include "../texthelp/textHelp.h"
-#include "../listhelp/listHelp.h"
+#include "../../../libs/kpunch/texthelp/textHelp.h"
+#include "../../../libs/kpunch/listhelp/listHelp.h"
 #include "stb_ds_wrap.h"
 
 static int32_t sTypeId = -1;
diff --git a/widgets/dataCtrl/dataCtrl.dhs b/src/widgets/kpunch/dataCtrl/dataCtrl.dhs
similarity index 100%
rename from widgets/dataCtrl/dataCtrl.dhs
rename to src/widgets/kpunch/dataCtrl/dataCtrl.dhs
diff --git a/widgets/dataCtrl/dataCtrl.h b/src/widgets/kpunch/dataCtrl/dataCtrl.h
similarity index 100%
rename from widgets/dataCtrl/dataCtrl.h
rename to src/widgets/kpunch/dataCtrl/dataCtrl.h
diff --git a/widgets/dataCtrl/datactr.bmp b/src/widgets/kpunch/dataCtrl/datactr.bmp
similarity index 100%
rename from widgets/dataCtrl/datactr.bmp
rename to src/widgets/kpunch/dataCtrl/datactr.bmp
diff --git a/widgets/dataCtrl/datactr.res b/src/widgets/kpunch/dataCtrl/datactr.res
similarity index 100%
rename from widgets/dataCtrl/datactr.res
rename to src/widgets/kpunch/dataCtrl/datactr.res
diff --git a/widgets/dataCtrl/datactrl.bhs b/src/widgets/kpunch/dataCtrl/datactrl.bhs
similarity index 100%
rename from widgets/dataCtrl/datactrl.bhs
rename to src/widgets/kpunch/dataCtrl/datactrl.bhs
diff --git a/widgets/dataCtrl/widgetDataCtrl.c b/src/widgets/kpunch/dataCtrl/widgetDataCtrl.c
similarity index 99%
rename from widgets/dataCtrl/widgetDataCtrl.c
rename to src/widgets/kpunch/dataCtrl/widgetDataCtrl.c
index 3e9bfdd..13696cf 100644
--- a/widgets/dataCtrl/widgetDataCtrl.c
+++ b/src/widgets/kpunch/dataCtrl/widgetDataCtrl.c
@@ -11,7 +11,7 @@
 // dvxSql* functions are resolved at load time.
 
 #include "dvxWgtP.h"
-#include "../../sql/dvxSql.h"
+#include "../../../libs/kpunch/sql/dvxSql.h"
 #include "thirdparty/stb_ds_wrap.h"
 
 #include <stdio.h>
diff --git a/widgets/dbGrid/dbGrid.dhs b/src/widgets/kpunch/dbGrid/dbGrid.dhs
similarity index 100%
rename from widgets/dbGrid/dbGrid.dhs
rename to src/widgets/kpunch/dbGrid/dbGrid.dhs
diff --git a/widgets/dbGrid/dbGrid.h b/src/widgets/kpunch/dbGrid/dbGrid.h
similarity index 100%
rename from widgets/dbGrid/dbGrid.h
rename to src/widgets/kpunch/dbGrid/dbGrid.h
diff --git a/widgets/dbGrid/dbgrid.bhs b/src/widgets/kpunch/dbGrid/dbgrid.bhs
similarity index 100%
rename from widgets/dbGrid/dbgrid.bhs
rename to src/widgets/kpunch/dbGrid/dbgrid.bhs
diff --git a/widgets/dbGrid/dbgrid.bmp b/src/widgets/kpunch/dbGrid/dbgrid.bmp
similarity index 100%
rename from widgets/dbGrid/dbgrid.bmp
rename to src/widgets/kpunch/dbGrid/dbgrid.bmp
diff --git a/widgets/dbGrid/dbgrid.res b/src/widgets/kpunch/dbGrid/dbgrid.res
similarity index 100%
rename from widgets/dbGrid/dbgrid.res
rename to src/widgets/kpunch/dbGrid/dbgrid.res
diff --git a/widgets/dbGrid/widgetDbGrid.c b/src/widgets/kpunch/dbGrid/widgetDbGrid.c
similarity index 100%
rename from widgets/dbGrid/widgetDbGrid.c
rename to src/widgets/kpunch/dbGrid/widgetDbGrid.c
diff --git a/widgets/dropdown/dropdown.bhs b/src/widgets/kpunch/dropdown/dropdown.bhs
similarity index 100%
rename from widgets/dropdown/dropdown.bhs
rename to src/widgets/kpunch/dropdown/dropdown.bhs
diff --git a/widgets/dropdown/dropdown.bmp b/src/widgets/kpunch/dropdown/dropdown.bmp
similarity index 100%
rename from widgets/dropdown/dropdown.bmp
rename to src/widgets/kpunch/dropdown/dropdown.bmp
diff --git a/config/dropdown.dep b/src/widgets/kpunch/dropdown/dropdown.dep
similarity index 100%
rename from config/dropdown.dep
rename to src/widgets/kpunch/dropdown/dropdown.dep
diff --git a/widgets/dropdown/dropdown.dhs b/src/widgets/kpunch/dropdown/dropdown.dhs
similarity index 100%
rename from widgets/dropdown/dropdown.dhs
rename to src/widgets/kpunch/dropdown/dropdown.dhs
diff --git a/widgets/dropdown/dropdown.h b/src/widgets/kpunch/dropdown/dropdown.h
similarity index 96%
rename from widgets/dropdown/dropdown.h
rename to src/widgets/kpunch/dropdown/dropdown.h
index 4ed1146..55d0c4c 100644
--- a/widgets/dropdown/dropdown.h
+++ b/src/widgets/kpunch/dropdown/dropdown.h
@@ -2,7 +2,7 @@
 #ifndef DROPDOWN_H
 #define DROPDOWN_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/dropdown/dropdown.res b/src/widgets/kpunch/dropdown/dropdown.res
similarity index 100%
rename from widgets/dropdown/dropdown.res
rename to src/widgets/kpunch/dropdown/dropdown.res
diff --git a/widgets/dropdown/widgetDropdown.c b/src/widgets/kpunch/dropdown/widgetDropdown.c
similarity index 99%
rename from widgets/dropdown/widgetDropdown.c
rename to src/widgets/kpunch/dropdown/widgetDropdown.c
index dd43639..9e6e793 100644
--- a/widgets/dropdown/widgetDropdown.c
+++ b/src/widgets/kpunch/dropdown/widgetDropdown.c
@@ -20,8 +20,8 @@
 // widgetDropdownPopupRect and widgetPaintPopupList in widgetCore.c.
 
 #include "dvxWgtP.h"
-#include "../texthelp/textHelp.h"
-#include "../listhelp/listHelp.h"
+#include "../../../libs/kpunch/texthelp/textHelp.h"
+#include "../../../libs/kpunch/listhelp/listHelp.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/image/image.bhs b/src/widgets/kpunch/image/image.bhs
similarity index 100%
rename from widgets/image/image.bhs
rename to src/widgets/kpunch/image/image.bhs
diff --git a/widgets/image/image.bmp b/src/widgets/kpunch/image/image.bmp
similarity index 100%
rename from widgets/image/image.bmp
rename to src/widgets/kpunch/image/image.bmp
diff --git a/widgets/image/image.dhs b/src/widgets/kpunch/image/image.dhs
similarity index 100%
rename from widgets/image/image.dhs
rename to src/widgets/kpunch/image/image.dhs
diff --git a/widgets/image/image.h b/src/widgets/kpunch/image/image.h
similarity index 96%
rename from widgets/image/image.h
rename to src/widgets/kpunch/image/image.h
index 85d4530..28272ef 100644
--- a/widgets/image/image.h
+++ b/src/widgets/kpunch/image/image.h
@@ -2,7 +2,7 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, uint8_t *data, int32_t w, int32_t h, int32_t pitch);
diff --git a/widgets/image/image.res b/src/widgets/kpunch/image/image.res
similarity index 100%
rename from widgets/image/image.res
rename to src/widgets/kpunch/image/image.res
diff --git a/widgets/image/widgetImage.c b/src/widgets/kpunch/image/widgetImage.c
similarity index 100%
rename from widgets/image/widgetImage.c
rename to src/widgets/kpunch/image/widgetImage.c
diff --git a/widgets/imageButton/imgBtn.h b/src/widgets/kpunch/imageButton/imgBtn.h
similarity index 95%
rename from widgets/imageButton/imgBtn.h
rename to src/widgets/kpunch/imageButton/imgBtn.h
index 47aa5b5..7e0d68f 100644
--- a/widgets/imageButton/imgBtn.h
+++ b/src/widgets/kpunch/imageButton/imgBtn.h
@@ -2,7 +2,7 @@
 #ifndef IMGBTN_H
 #define IMGBTN_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, uint8_t *data, int32_t w, int32_t h, int32_t pitch);
diff --git a/widgets/imageButton/imgbtn.bhs b/src/widgets/kpunch/imageButton/imgbtn.bhs
similarity index 100%
rename from widgets/imageButton/imgbtn.bhs
rename to src/widgets/kpunch/imageButton/imgbtn.bhs
diff --git a/widgets/imageButton/imgbtn.bmp b/src/widgets/kpunch/imageButton/imgbtn.bmp
similarity index 100%
rename from widgets/imageButton/imgbtn.bmp
rename to src/widgets/kpunch/imageButton/imgbtn.bmp
diff --git a/widgets/imageButton/imgbtn.dhs b/src/widgets/kpunch/imageButton/imgbtn.dhs
similarity index 100%
rename from widgets/imageButton/imgbtn.dhs
rename to src/widgets/kpunch/imageButton/imgbtn.dhs
diff --git a/widgets/imageButton/imgbtn.res b/src/widgets/kpunch/imageButton/imgbtn.res
similarity index 100%
rename from widgets/imageButton/imgbtn.res
rename to src/widgets/kpunch/imageButton/imgbtn.res
diff --git a/widgets/imageButton/widgetImageButton.c b/src/widgets/kpunch/imageButton/widgetImageButton.c
similarity index 100%
rename from widgets/imageButton/widgetImageButton.c
rename to src/widgets/kpunch/imageButton/widgetImageButton.c
diff --git a/widgets/label/label.bhs b/src/widgets/kpunch/label/label.bhs
similarity index 100%
rename from widgets/label/label.bhs
rename to src/widgets/kpunch/label/label.bhs
diff --git a/widgets/label/label.bmp b/src/widgets/kpunch/label/label.bmp
similarity index 100%
rename from widgets/label/label.bmp
rename to src/widgets/kpunch/label/label.bmp
diff --git a/widgets/label/label.dhs b/src/widgets/kpunch/label/label.dhs
similarity index 100%
rename from widgets/label/label.dhs
rename to src/widgets/kpunch/label/label.dhs
diff --git a/widgets/label/label.h b/src/widgets/kpunch/label/label.h
similarity index 91%
rename from widgets/label/label.h
rename to src/widgets/kpunch/label/label.h
index dc74403..ad80e6b 100644
--- a/widgets/label/label.h
+++ b/src/widgets/kpunch/label/label.h
@@ -2,7 +2,7 @@
 #ifndef LABEL_H
 #define LABEL_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, const char *text);
diff --git a/widgets/label/label.res b/src/widgets/kpunch/label/label.res
similarity index 100%
rename from widgets/label/label.res
rename to src/widgets/kpunch/label/label.res
diff --git a/widgets/label/widgetLabel.c b/src/widgets/kpunch/label/widgetLabel.c
similarity index 100%
rename from widgets/label/widgetLabel.c
rename to src/widgets/kpunch/label/widgetLabel.c
diff --git a/widgets/listBox/listBox.dhs b/src/widgets/kpunch/listBox/listBox.dhs
similarity index 100%
rename from widgets/listBox/listBox.dhs
rename to src/widgets/kpunch/listBox/listBox.dhs
diff --git a/widgets/listBox/listBox.h b/src/widgets/kpunch/listBox/listBox.h
similarity index 97%
rename from widgets/listBox/listBox.h
rename to src/widgets/kpunch/listBox/listBox.h
index 0029e15..e8feb08 100644
--- a/widgets/listBox/listBox.h
+++ b/src/widgets/kpunch/listBox/listBox.h
@@ -2,7 +2,7 @@
 #ifndef LISTBOX_H
 #define LISTBOX_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/listBox/listbox.bhs b/src/widgets/kpunch/listBox/listbox.bhs
similarity index 100%
rename from widgets/listBox/listbox.bhs
rename to src/widgets/kpunch/listBox/listbox.bhs
diff --git a/widgets/listBox/listbox.bmp b/src/widgets/kpunch/listBox/listbox.bmp
similarity index 100%
rename from widgets/listBox/listbox.bmp
rename to src/widgets/kpunch/listBox/listbox.bmp
diff --git a/config/listbox.dep b/src/widgets/kpunch/listBox/listbox.dep
similarity index 100%
rename from config/listbox.dep
rename to src/widgets/kpunch/listBox/listbox.dep
diff --git a/widgets/listBox/listbox.res b/src/widgets/kpunch/listBox/listbox.res
similarity index 100%
rename from widgets/listBox/listbox.res
rename to src/widgets/kpunch/listBox/listbox.res
diff --git a/widgets/listBox/widgetListBox.c b/src/widgets/kpunch/listBox/widgetListBox.c
similarity index 99%
rename from widgets/listBox/widgetListBox.c
rename to src/widgets/kpunch/listBox/widgetListBox.c
index e4dda61..ea9f16d 100644
--- a/widgets/listBox/widgetListBox.c
+++ b/src/widgets/kpunch/listBox/widgetListBox.c
@@ -29,7 +29,7 @@
 // reordering is handled by the application's onReorder callback.
 
 #include "dvxWgtP.h"
-#include "../listhelp/listHelp.h"
+#include "../../../libs/kpunch/listhelp/listHelp.h"
 
 #define LISTBOX_BORDER       2
 
diff --git a/widgets/listView/listView.dhs b/src/widgets/kpunch/listView/listView.dhs
similarity index 100%
rename from widgets/listView/listView.dhs
rename to src/widgets/kpunch/listView/listView.dhs
diff --git a/widgets/listView/listView.h b/src/widgets/kpunch/listView/listView.h
similarity index 98%
rename from widgets/listView/listView.h
rename to src/widgets/kpunch/listView/listView.h
index 7ad676b..08e69d7 100644
--- a/widgets/listView/listView.h
+++ b/src/widgets/kpunch/listView/listView.h
@@ -6,7 +6,7 @@
 #ifndef LISTVIEW_H
 #define LISTVIEW_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/listView/listview.bhs b/src/widgets/kpunch/listView/listview.bhs
similarity index 100%
rename from widgets/listView/listview.bhs
rename to src/widgets/kpunch/listView/listview.bhs
diff --git a/widgets/listView/listview.bmp b/src/widgets/kpunch/listView/listview.bmp
similarity index 100%
rename from widgets/listView/listview.bmp
rename to src/widgets/kpunch/listView/listview.bmp
diff --git a/config/listview.dep b/src/widgets/kpunch/listView/listview.dep
similarity index 100%
rename from config/listview.dep
rename to src/widgets/kpunch/listView/listview.dep
diff --git a/widgets/listView/listview.res b/src/widgets/kpunch/listView/listview.res
similarity index 100%
rename from widgets/listView/listview.res
rename to src/widgets/kpunch/listView/listview.res
diff --git a/widgets/listView/widgetListView.c b/src/widgets/kpunch/listView/widgetListView.c
similarity index 99%
rename from widgets/listView/widgetListView.c
rename to src/widgets/kpunch/listView/widgetListView.c
index 447d36f..d5b3a98 100644
--- a/widgets/listView/widgetListView.c
+++ b/src/widgets/kpunch/listView/widgetListView.c
@@ -50,7 +50,7 @@
 // two-pass logic handles the interdependency correctly.
 
 #include "dvxWgtP.h"
-#include "../listhelp/listHelp.h"
+#include "../../../libs/kpunch/listhelp/listHelp.h"
 
 #define LISTVIEW_BORDER      2
 #define LISTVIEW_MIN_COL_W   20
diff --git a/widgets/progressBar/progress.bhs b/src/widgets/kpunch/progressBar/progress.bhs
similarity index 100%
rename from widgets/progressBar/progress.bhs
rename to src/widgets/kpunch/progressBar/progress.bhs
diff --git a/widgets/progressBar/progress.bmp b/src/widgets/kpunch/progressBar/progress.bmp
similarity index 100%
rename from widgets/progressBar/progress.bmp
rename to src/widgets/kpunch/progressBar/progress.bmp
diff --git a/widgets/progressBar/progress.dhs b/src/widgets/kpunch/progressBar/progress.dhs
similarity index 100%
rename from widgets/progressBar/progress.dhs
rename to src/widgets/kpunch/progressBar/progress.dhs
diff --git a/widgets/progressBar/progress.h b/src/widgets/kpunch/progressBar/progress.h
similarity index 94%
rename from widgets/progressBar/progress.h
rename to src/widgets/kpunch/progressBar/progress.h
index 2cb481e..3bc63f1 100644
--- a/widgets/progressBar/progress.h
+++ b/src/widgets/kpunch/progressBar/progress.h
@@ -2,7 +2,7 @@
 #ifndef PROGRESS_H
 #define PROGRESS_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/progressBar/progress.res b/src/widgets/kpunch/progressBar/progress.res
similarity index 100%
rename from widgets/progressBar/progress.res
rename to src/widgets/kpunch/progressBar/progress.res
diff --git a/widgets/progressBar/widgetProgressBar.c b/src/widgets/kpunch/progressBar/widgetProgressBar.c
similarity index 100%
rename from widgets/progressBar/widgetProgressBar.c
rename to src/widgets/kpunch/progressBar/widgetProgressBar.c
diff --git a/widgets/radio/radio.bhs b/src/widgets/kpunch/radio/radio.bhs
similarity index 100%
rename from widgets/radio/radio.bhs
rename to src/widgets/kpunch/radio/radio.bhs
diff --git a/widgets/radio/radio.bmp b/src/widgets/kpunch/radio/radio.bmp
similarity index 100%
rename from widgets/radio/radio.bmp
rename to src/widgets/kpunch/radio/radio.bmp
diff --git a/widgets/radio/radio.dhs b/src/widgets/kpunch/radio/radio.dhs
similarity index 100%
rename from widgets/radio/radio.dhs
rename to src/widgets/kpunch/radio/radio.dhs
diff --git a/widgets/radio/radio.h b/src/widgets/kpunch/radio/radio.h
similarity index 94%
rename from widgets/radio/radio.h
rename to src/widgets/kpunch/radio/radio.h
index 05714a1..3473aca 100644
--- a/widgets/radio/radio.h
+++ b/src/widgets/kpunch/radio/radio.h
@@ -2,7 +2,7 @@
 #ifndef RADIO_H
 #define RADIO_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*group)(WidgetT *parent);
diff --git a/widgets/radio/radio.res b/src/widgets/kpunch/radio/radio.res
similarity index 100%
rename from widgets/radio/radio.res
rename to src/widgets/kpunch/radio/radio.res
diff --git a/widgets/radio/widgetRadio.c b/src/widgets/kpunch/radio/widgetRadio.c
similarity index 100%
rename from widgets/radio/widgetRadio.c
rename to src/widgets/kpunch/radio/widgetRadio.c
diff --git a/widgets/scrollPane/scrlPane.h b/src/widgets/kpunch/scrollPane/scrlPane.h
similarity index 94%
rename from widgets/scrollPane/scrlPane.h
rename to src/widgets/kpunch/scrollPane/scrlPane.h
index 3601e03..0b75a7f 100644
--- a/widgets/scrollPane/scrlPane.h
+++ b/src/widgets/kpunch/scrollPane/scrlPane.h
@@ -2,7 +2,7 @@
 #ifndef SCRLPANE_H
 #define SCRLPANE_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/scrollPane/scrlpane.bhs b/src/widgets/kpunch/scrollPane/scrlpane.bhs
similarity index 100%
rename from widgets/scrollPane/scrlpane.bhs
rename to src/widgets/kpunch/scrollPane/scrlpane.bhs
diff --git a/widgets/scrollPane/scrlpane.bmp b/src/widgets/kpunch/scrollPane/scrlpane.bmp
similarity index 100%
rename from widgets/scrollPane/scrlpane.bmp
rename to src/widgets/kpunch/scrollPane/scrlpane.bmp
diff --git a/widgets/scrollPane/scrlpane.dhs b/src/widgets/kpunch/scrollPane/scrlpane.dhs
similarity index 100%
rename from widgets/scrollPane/scrlpane.dhs
rename to src/widgets/kpunch/scrollPane/scrlpane.dhs
diff --git a/widgets/scrollPane/scrlpane.res b/src/widgets/kpunch/scrollPane/scrlpane.res
similarity index 100%
rename from widgets/scrollPane/scrlpane.res
rename to src/widgets/kpunch/scrollPane/scrlpane.res
diff --git a/widgets/scrollPane/widgetScrollPane.c b/src/widgets/kpunch/scrollPane/widgetScrollPane.c
similarity index 100%
rename from widgets/scrollPane/widgetScrollPane.c
rename to src/widgets/kpunch/scrollPane/widgetScrollPane.c
diff --git a/widgets/separator/separatr.bmp b/src/widgets/kpunch/separator/separatr.bmp
similarity index 100%
rename from widgets/separator/separatr.bmp
rename to src/widgets/kpunch/separator/separatr.bmp
diff --git a/widgets/separator/separatr.h b/src/widgets/kpunch/separator/separatr.h
similarity index 92%
rename from widgets/separator/separatr.h
rename to src/widgets/kpunch/separator/separatr.h
index 1a874d6..96ff1cb 100644
--- a/widgets/separator/separatr.h
+++ b/src/widgets/kpunch/separator/separatr.h
@@ -2,7 +2,7 @@
 #ifndef SEPARATR_H
 #define SEPARATR_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*hSeparator)(WidgetT *parent);
diff --git a/widgets/separator/separatr.res b/src/widgets/kpunch/separator/separatr.res
similarity index 100%
rename from widgets/separator/separatr.res
rename to src/widgets/kpunch/separator/separatr.res
diff --git a/widgets/separator/widgetSeparator.c b/src/widgets/kpunch/separator/widgetSeparator.c
similarity index 100%
rename from widgets/separator/widgetSeparator.c
rename to src/widgets/kpunch/separator/widgetSeparator.c
diff --git a/widgets/separatr/separatr.bhs b/src/widgets/kpunch/separatr/separatr.bhs
similarity index 100%
rename from widgets/separatr/separatr.bhs
rename to src/widgets/kpunch/separatr/separatr.bhs
diff --git a/widgets/separatr/separatr.dhs b/src/widgets/kpunch/separatr/separatr.dhs
similarity index 100%
rename from widgets/separatr/separatr.dhs
rename to src/widgets/kpunch/separatr/separatr.dhs
diff --git a/widgets/slider/slider.bhs b/src/widgets/kpunch/slider/slider.bhs
similarity index 100%
rename from widgets/slider/slider.bhs
rename to src/widgets/kpunch/slider/slider.bhs
diff --git a/widgets/slider/slider.bmp b/src/widgets/kpunch/slider/slider.bmp
similarity index 100%
rename from widgets/slider/slider.bmp
rename to src/widgets/kpunch/slider/slider.bmp
diff --git a/widgets/slider/slider.dhs b/src/widgets/kpunch/slider/slider.dhs
similarity index 100%
rename from widgets/slider/slider.dhs
rename to src/widgets/kpunch/slider/slider.dhs
diff --git a/widgets/slider/slider.h b/src/widgets/kpunch/slider/slider.h
similarity index 93%
rename from widgets/slider/slider.h
rename to src/widgets/kpunch/slider/slider.h
index 94dfd37..d075099 100644
--- a/widgets/slider/slider.h
+++ b/src/widgets/kpunch/slider/slider.h
@@ -2,7 +2,7 @@
 #ifndef SLIDER_H
 #define SLIDER_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, int32_t minVal, int32_t maxVal);
diff --git a/widgets/slider/slider.res b/src/widgets/kpunch/slider/slider.res
similarity index 100%
rename from widgets/slider/slider.res
rename to src/widgets/kpunch/slider/slider.res
diff --git a/widgets/slider/widgetSlider.c b/src/widgets/kpunch/slider/widgetSlider.c
similarity index 100%
rename from widgets/slider/widgetSlider.c
rename to src/widgets/kpunch/slider/widgetSlider.c
diff --git a/widgets/spacer/spacer.bhs b/src/widgets/kpunch/spacer/spacer.bhs
similarity index 100%
rename from widgets/spacer/spacer.bhs
rename to src/widgets/kpunch/spacer/spacer.bhs
diff --git a/widgets/spacer/spacer.bmp b/src/widgets/kpunch/spacer/spacer.bmp
similarity index 100%
rename from widgets/spacer/spacer.bmp
rename to src/widgets/kpunch/spacer/spacer.bmp
diff --git a/widgets/spacer/spacer.dhs b/src/widgets/kpunch/spacer/spacer.dhs
similarity index 100%
rename from widgets/spacer/spacer.dhs
rename to src/widgets/kpunch/spacer/spacer.dhs
diff --git a/widgets/spacer/spacer.h b/src/widgets/kpunch/spacer/spacer.h
similarity index 89%
rename from widgets/spacer/spacer.h
rename to src/widgets/kpunch/spacer/spacer.h
index ad3267a..c1e5e3a 100644
--- a/widgets/spacer/spacer.h
+++ b/src/widgets/kpunch/spacer/spacer.h
@@ -2,7 +2,7 @@
 #ifndef SPACER_H
 #define SPACER_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/spacer/spacer.res b/src/widgets/kpunch/spacer/spacer.res
similarity index 100%
rename from widgets/spacer/spacer.res
rename to src/widgets/kpunch/spacer/spacer.res
diff --git a/widgets/spacer/widgetSpacer.c b/src/widgets/kpunch/spacer/widgetSpacer.c
similarity index 100%
rename from widgets/spacer/widgetSpacer.c
rename to src/widgets/kpunch/spacer/widgetSpacer.c
diff --git a/widgets/spinner/spinner.bhs b/src/widgets/kpunch/spinner/spinner.bhs
similarity index 100%
rename from widgets/spinner/spinner.bhs
rename to src/widgets/kpunch/spinner/spinner.bhs
diff --git a/widgets/spinner/spinner.bmp b/src/widgets/kpunch/spinner/spinner.bmp
similarity index 100%
rename from widgets/spinner/spinner.bmp
rename to src/widgets/kpunch/spinner/spinner.bmp
diff --git a/config/spinner.dep b/src/widgets/kpunch/spinner/spinner.dep
similarity index 100%
rename from config/spinner.dep
rename to src/widgets/kpunch/spinner/spinner.dep
diff --git a/widgets/spinner/spinner.dhs b/src/widgets/kpunch/spinner/spinner.dhs
similarity index 100%
rename from widgets/spinner/spinner.dhs
rename to src/widgets/kpunch/spinner/spinner.dhs
diff --git a/widgets/spinner/spinner.h b/src/widgets/kpunch/spinner/spinner.h
similarity index 97%
rename from widgets/spinner/spinner.h
rename to src/widgets/kpunch/spinner/spinner.h
index a85d362..ecb9113 100644
--- a/widgets/spinner/spinner.h
+++ b/src/widgets/kpunch/spinner/spinner.h
@@ -2,7 +2,7 @@
 #ifndef SPINNER_H
 #define SPINNER_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, int32_t minVal, int32_t maxVal, int32_t step);
diff --git a/widgets/spinner/spinner.res b/src/widgets/kpunch/spinner/spinner.res
similarity index 100%
rename from widgets/spinner/spinner.res
rename to src/widgets/kpunch/spinner/spinner.res
diff --git a/widgets/spinner/widgetSpinner.c b/src/widgets/kpunch/spinner/widgetSpinner.c
similarity index 99%
rename from widgets/spinner/widgetSpinner.c
rename to src/widgets/kpunch/spinner/widgetSpinner.c
index 9128fe0..9f1a129 100644
--- a/widgets/spinner/widgetSpinner.c
+++ b/src/widgets/kpunch/spinner/widgetSpinner.c
@@ -36,7 +36,7 @@
 // split the widget height evenly.
 
 #include "dvxWgtP.h"
-#include "../texthelp/textHelp.h"
+#include "../../../libs/kpunch/texthelp/textHelp.h"
 
 static int32_t sTypeId = -1;
 
diff --git a/widgets/splitter/splitter.bhs b/src/widgets/kpunch/splitter/splitter.bhs
similarity index 100%
rename from widgets/splitter/splitter.bhs
rename to src/widgets/kpunch/splitter/splitter.bhs
diff --git a/widgets/splitter/splitter.bmp b/src/widgets/kpunch/splitter/splitter.bmp
similarity index 100%
rename from widgets/splitter/splitter.bmp
rename to src/widgets/kpunch/splitter/splitter.bmp
diff --git a/widgets/splitter/splitter.dhs b/src/widgets/kpunch/splitter/splitter.dhs
similarity index 100%
rename from widgets/splitter/splitter.dhs
rename to src/widgets/kpunch/splitter/splitter.dhs
diff --git a/widgets/splitter/splitter.h b/src/widgets/kpunch/splitter/splitter.h
similarity index 93%
rename from widgets/splitter/splitter.h
rename to src/widgets/kpunch/splitter/splitter.h
index e834931..b0c82c5 100644
--- a/widgets/splitter/splitter.h
+++ b/src/widgets/kpunch/splitter/splitter.h
@@ -2,7 +2,7 @@
 #ifndef SPLITTER_H
 #define SPLITTER_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, bool vertical);
diff --git a/widgets/splitter/splitter.res b/src/widgets/kpunch/splitter/splitter.res
similarity index 100%
rename from widgets/splitter/splitter.res
rename to src/widgets/kpunch/splitter/splitter.res
diff --git a/widgets/splitter/widgetSplitter.c b/src/widgets/kpunch/splitter/widgetSplitter.c
similarity index 100%
rename from widgets/splitter/widgetSplitter.c
rename to src/widgets/kpunch/splitter/widgetSplitter.c
diff --git a/widgets/statbar/statbar.bhs b/src/widgets/kpunch/statbar/statbar.bhs
similarity index 100%
rename from widgets/statbar/statbar.bhs
rename to src/widgets/kpunch/statbar/statbar.bhs
diff --git a/widgets/statbar/statbar.dhs b/src/widgets/kpunch/statbar/statbar.dhs
similarity index 100%
rename from widgets/statbar/statbar.dhs
rename to src/widgets/kpunch/statbar/statbar.dhs
diff --git a/widgets/statusBar/statBar.h b/src/widgets/kpunch/statusBar/statBar.h
similarity index 89%
rename from widgets/statusBar/statBar.h
rename to src/widgets/kpunch/statusBar/statBar.h
index 040032c..92d28b7 100644
--- a/widgets/statusBar/statBar.h
+++ b/src/widgets/kpunch/statusBar/statBar.h
@@ -2,7 +2,7 @@
 #ifndef STATBAR_H
 #define STATBAR_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/statusBar/statbar.bmp b/src/widgets/kpunch/statusBar/statbar.bmp
similarity index 100%
rename from widgets/statusBar/statbar.bmp
rename to src/widgets/kpunch/statusBar/statbar.bmp
diff --git a/widgets/statusBar/statbar.res b/src/widgets/kpunch/statusBar/statbar.res
similarity index 100%
rename from widgets/statusBar/statbar.res
rename to src/widgets/kpunch/statusBar/statbar.res
diff --git a/widgets/statusBar/widgetStatusBar.c b/src/widgets/kpunch/statusBar/widgetStatusBar.c
similarity index 100%
rename from widgets/statusBar/widgetStatusBar.c
rename to src/widgets/kpunch/statusBar/widgetStatusBar.c
diff --git a/widgets/tabControl/tabCtrl.h b/src/widgets/kpunch/tabControl/tabCtrl.h
similarity index 94%
rename from widgets/tabControl/tabCtrl.h
rename to src/widgets/kpunch/tabControl/tabCtrl.h
index c2f86f3..cb7ee89 100644
--- a/widgets/tabControl/tabCtrl.h
+++ b/src/widgets/kpunch/tabControl/tabCtrl.h
@@ -2,7 +2,7 @@
 #ifndef TABCTRL_H
 #define TABCTRL_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/tabControl/tabctrl.bhs b/src/widgets/kpunch/tabControl/tabctrl.bhs
similarity index 100%
rename from widgets/tabControl/tabctrl.bhs
rename to src/widgets/kpunch/tabControl/tabctrl.bhs
diff --git a/widgets/tabControl/tabctrl.bmp b/src/widgets/kpunch/tabControl/tabctrl.bmp
similarity index 100%
rename from widgets/tabControl/tabctrl.bmp
rename to src/widgets/kpunch/tabControl/tabctrl.bmp
diff --git a/widgets/tabControl/tabctrl.dhs b/src/widgets/kpunch/tabControl/tabctrl.dhs
similarity index 100%
rename from widgets/tabControl/tabctrl.dhs
rename to src/widgets/kpunch/tabControl/tabctrl.dhs
diff --git a/widgets/tabControl/tabctrl.res b/src/widgets/kpunch/tabControl/tabctrl.res
similarity index 100%
rename from widgets/tabControl/tabctrl.res
rename to src/widgets/kpunch/tabControl/tabctrl.res
diff --git a/widgets/tabControl/widgetTabControl.c b/src/widgets/kpunch/tabControl/widgetTabControl.c
similarity index 100%
rename from widgets/tabControl/widgetTabControl.c
rename to src/widgets/kpunch/tabControl/widgetTabControl.c
diff --git a/widgets/textInput/textInpt.h b/src/widgets/kpunch/textInput/textInpt.h
similarity index 98%
rename from widgets/textInput/textInpt.h
rename to src/widgets/kpunch/textInput/textInpt.h
index b60b16d..24ce9ed 100644
--- a/widgets/textInput/textInpt.h
+++ b/src/widgets/kpunch/textInput/textInpt.h
@@ -2,7 +2,7 @@
 #ifndef TEXTINPT_H
 #define TEXTINPT_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 // Colorize callback: called for each visible line during paint.
 // line: pointer into the buffer (NOT null-terminated).
diff --git a/widgets/textInput/textinpt.bhs b/src/widgets/kpunch/textInput/textinpt.bhs
similarity index 100%
rename from widgets/textInput/textinpt.bhs
rename to src/widgets/kpunch/textInput/textinpt.bhs
diff --git a/widgets/textInput/textinpt.bmp b/src/widgets/kpunch/textInput/textinpt.bmp
similarity index 100%
rename from widgets/textInput/textinpt.bmp
rename to src/widgets/kpunch/textInput/textinpt.bmp
diff --git a/config/textinpt.dep b/src/widgets/kpunch/textInput/textinpt.dep
similarity index 100%
rename from config/textinpt.dep
rename to src/widgets/kpunch/textInput/textinpt.dep
diff --git a/widgets/textInput/textinpt.dhs b/src/widgets/kpunch/textInput/textinpt.dhs
similarity index 100%
rename from widgets/textInput/textinpt.dhs
rename to src/widgets/kpunch/textInput/textinpt.dhs
diff --git a/widgets/textInput/textinpt.res b/src/widgets/kpunch/textInput/textinpt.res
similarity index 100%
rename from widgets/textInput/textinpt.res
rename to src/widgets/kpunch/textInput/textinpt.res
diff --git a/widgets/textInput/widgetTextInput.c b/src/widgets/kpunch/textInput/widgetTextInput.c
similarity index 99%
rename from widgets/textInput/widgetTextInput.c
rename to src/widgets/kpunch/textInput/widgetTextInput.c
index e75e3be..38f5a9e 100644
--- a/widgets/textInput/widgetTextInput.c
+++ b/src/widgets/kpunch/textInput/widgetTextInput.c
@@ -56,7 +56,7 @@
 // and blocks copy/cut operations for security.
 
 #include "dvxWgtP.h"
-#include "../texthelp/textHelp.h"
+#include "../../../libs/kpunch/texthelp/textHelp.h"
 
 static int32_t sTextInputTypeId = -1;
 static int32_t sTextAreaTypeId  = -1;
diff --git a/widgets/timer/timer.bhs b/src/widgets/kpunch/timer/timer.bhs
similarity index 100%
rename from widgets/timer/timer.bhs
rename to src/widgets/kpunch/timer/timer.bhs
diff --git a/widgets/timer/timer.bmp b/src/widgets/kpunch/timer/timer.bmp
similarity index 100%
rename from widgets/timer/timer.bmp
rename to src/widgets/kpunch/timer/timer.bmp
diff --git a/widgets/timer/timer.dhs b/src/widgets/kpunch/timer/timer.dhs
similarity index 100%
rename from widgets/timer/timer.dhs
rename to src/widgets/kpunch/timer/timer.dhs
diff --git a/widgets/timer/timer.h b/src/widgets/kpunch/timer/timer.h
similarity index 95%
rename from widgets/timer/timer.h
rename to src/widgets/kpunch/timer/timer.h
index 25595fc..e41dc00 100644
--- a/widgets/timer/timer.h
+++ b/src/widgets/kpunch/timer/timer.h
@@ -2,7 +2,7 @@
 #ifndef TIMER_H
 #define TIMER_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent, int32_t intervalMs, bool repeat);
diff --git a/widgets/timer/timer.res b/src/widgets/kpunch/timer/timer.res
similarity index 100%
rename from widgets/timer/timer.res
rename to src/widgets/kpunch/timer/timer.res
diff --git a/widgets/timer/widgetTimer.c b/src/widgets/kpunch/timer/widgetTimer.c
similarity index 100%
rename from widgets/timer/widgetTimer.c
rename to src/widgets/kpunch/timer/widgetTimer.c
diff --git a/widgets/toolbar/toolbar.bhs b/src/widgets/kpunch/toolbar/toolbar.bhs
similarity index 100%
rename from widgets/toolbar/toolbar.bhs
rename to src/widgets/kpunch/toolbar/toolbar.bhs
diff --git a/widgets/toolbar/toolbar.bmp b/src/widgets/kpunch/toolbar/toolbar.bmp
similarity index 100%
rename from widgets/toolbar/toolbar.bmp
rename to src/widgets/kpunch/toolbar/toolbar.bmp
diff --git a/widgets/toolbar/toolbar.dhs b/src/widgets/kpunch/toolbar/toolbar.dhs
similarity index 100%
rename from widgets/toolbar/toolbar.dhs
rename to src/widgets/kpunch/toolbar/toolbar.dhs
diff --git a/widgets/toolbar/toolbar.h b/src/widgets/kpunch/toolbar/toolbar.h
similarity index 89%
rename from widgets/toolbar/toolbar.h
rename to src/widgets/kpunch/toolbar/toolbar.h
index 277169f..d09bf7b 100644
--- a/widgets/toolbar/toolbar.h
+++ b/src/widgets/kpunch/toolbar/toolbar.h
@@ -2,7 +2,7 @@
 #ifndef TOOLBAR_H
 #define TOOLBAR_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/toolbar/toolbar.res b/src/widgets/kpunch/toolbar/toolbar.res
similarity index 100%
rename from widgets/toolbar/toolbar.res
rename to src/widgets/kpunch/toolbar/toolbar.res
diff --git a/widgets/toolbar/widgetToolbar.c b/src/widgets/kpunch/toolbar/widgetToolbar.c
similarity index 100%
rename from widgets/toolbar/widgetToolbar.c
rename to src/widgets/kpunch/toolbar/widgetToolbar.c
diff --git a/widgets/treeView/treeView.dhs b/src/widgets/kpunch/treeView/treeView.dhs
similarity index 100%
rename from widgets/treeView/treeView.dhs
rename to src/widgets/kpunch/treeView/treeView.dhs
diff --git a/widgets/treeView/treeView.h b/src/widgets/kpunch/treeView/treeView.h
similarity index 97%
rename from widgets/treeView/treeView.h
rename to src/widgets/kpunch/treeView/treeView.h
index 99b8b27..00b0ecf 100644
--- a/widgets/treeView/treeView.h
+++ b/src/widgets/kpunch/treeView/treeView.h
@@ -2,7 +2,7 @@
 #ifndef TREEVIEW_H
 #define TREEVIEW_H
 
-#include "../../core/dvxWgt.h"
+#include "../../../libs/kpunch/libdvx/dvxWgt.h"
 
 typedef struct {
     WidgetT *(*create)(WidgetT *parent);
diff --git a/widgets/treeView/treeview.bhs b/src/widgets/kpunch/treeView/treeview.bhs
similarity index 100%
rename from widgets/treeView/treeview.bhs
rename to src/widgets/kpunch/treeView/treeview.bhs
diff --git a/widgets/treeView/treeview.bmp b/src/widgets/kpunch/treeView/treeview.bmp
similarity index 100%
rename from widgets/treeView/treeview.bmp
rename to src/widgets/kpunch/treeView/treeview.bmp
diff --git a/config/treeview.dep b/src/widgets/kpunch/treeView/treeview.dep
similarity index 100%
rename from config/treeview.dep
rename to src/widgets/kpunch/treeView/treeview.dep
diff --git a/widgets/treeView/treeview.res b/src/widgets/kpunch/treeView/treeview.res
similarity index 100%
rename from widgets/treeView/treeview.res
rename to src/widgets/kpunch/treeView/treeview.res
diff --git a/widgets/treeView/widgetTreeView.c b/src/widgets/kpunch/treeView/widgetTreeView.c
similarity index 100%
rename from widgets/treeView/widgetTreeView.c
rename to src/widgets/kpunch/treeView/widgetTreeView.c
diff --git a/widgets/wgtsys.dhs b/src/widgets/kpunch/wgtsys.dhs
similarity index 100%
rename from widgets/wgtsys.dhs
rename to src/widgets/kpunch/wgtsys.dhs
diff --git a/widgets/wrapBox/widgetWrapBox.c b/src/widgets/kpunch/wrapBox/widgetWrapBox.c
similarity index 100%
rename from widgets/wrapBox/widgetWrapBox.c
rename to src/widgets/kpunch/wrapBox/widgetWrapBox.c
diff --git a/widgets/wrapBox/wrapBox.dhs b/src/widgets/kpunch/wrapBox/wrapBox.dhs
similarity index 100%
rename from widgets/wrapBox/wrapBox.dhs
rename to src/widgets/kpunch/wrapBox/wrapBox.dhs
diff --git a/widgets/wrapBox/wrapBox.h b/src/widgets/kpunch/wrapBox/wrapBox.h
similarity index 100%
rename from widgets/wrapBox/wrapBox.h
rename to src/widgets/kpunch/wrapBox/wrapBox.h
diff --git a/widgets/wrapBox/wrapbox.bhs b/src/widgets/kpunch/wrapBox/wrapbox.bhs
similarity index 100%
rename from widgets/wrapBox/wrapbox.bhs
rename to src/widgets/kpunch/wrapBox/wrapbox.bhs
diff --git a/widgets/wrapBox/wrapbox.bmp b/src/widgets/kpunch/wrapBox/wrapbox.bmp
similarity index 100%
rename from widgets/wrapBox/wrapbox.bmp
rename to src/widgets/kpunch/wrapBox/wrapbox.bmp
diff --git a/widgets/wrapBox/wrapbox.res b/src/widgets/kpunch/wrapBox/wrapbox.res
similarity index 100%
rename from widgets/wrapBox/wrapbox.res
rename to src/widgets/kpunch/wrapBox/wrapbox.res
diff --git a/apps/imgview/icon32.bmp b/unused/apps/imgview-c/icon32.bmp
similarity index 100%
rename from apps/imgview/icon32.bmp
rename to unused/apps/imgview-c/icon32.bmp
diff --git a/apps/imgview/imgview.c b/unused/apps/imgview-c/imgview.c
similarity index 100%
rename from apps/imgview/imgview.c
rename to unused/apps/imgview-c/imgview.c
diff --git a/apps/imgview/imgview.res b/unused/apps/imgview-c/imgview.res
similarity index 100%
rename from apps/imgview/imgview.res
rename to unused/apps/imgview-c/imgview.res
diff --git a/apps/notepad/icon32.bmp b/unused/apps/notepad-c/icon32.bmp
similarity index 100%
rename from apps/notepad/icon32.bmp
rename to unused/apps/notepad-c/icon32.bmp
diff --git a/apps/notepad/notepad.c b/unused/apps/notepad-c/notepad.c
similarity index 100%
rename from apps/notepad/notepad.c
rename to unused/apps/notepad-c/notepad.c
diff --git a/apps/notepad/notepad.res b/unused/apps/notepad-c/notepad.res
similarity index 100%
rename from apps/notepad/notepad.res
rename to unused/apps/notepad-c/notepad.res
diff --git a/apps/dvxbasic/formrt/formcfm.c b/unused/formcfm.c
similarity index 100%
rename from apps/dvxbasic/formrt/formcfm.c
rename to unused/formcfm.c
diff --git a/apps/dvxbasic/formrt/formcfm.h b/unused/formcfm.h
similarity index 100%
rename from apps/dvxbasic/formrt/formcfm.h
rename to unused/formcfm.h
diff --git a/sdk/samples/basic/commdlg.frm b/unused/samples/commdlg.frm
similarity index 100%
rename from sdk/samples/basic/commdlg.frm
rename to unused/samples/commdlg.frm
diff --git a/sdk/samples/basic/dynform.bas b/unused/samples/dynform.bas
similarity index 100%
rename from sdk/samples/basic/dynform.bas
rename to unused/samples/dynform.bas
diff --git a/sdk/samples/hello/hello.c b/unused/samples/hello/hello.c
similarity index 100%
rename from sdk/samples/hello/hello.c
rename to unused/samples/hello/hello.c
diff --git a/sdk/samples/hello/hello.res b/unused/samples/hello/hello.res
similarity index 100%
rename from sdk/samples/hello/hello.res
rename to unused/samples/hello/hello.res
diff --git a/sdk/samples/hello/icon32.bmp b/unused/samples/hello/icon32.bmp
similarity index 100%
rename from sdk/samples/hello/icon32.bmp
rename to unused/samples/hello/icon32.bmp
diff --git a/sdk/samples/hello/makefile b/unused/samples/hello/makefile
similarity index 100%
rename from sdk/samples/hello/makefile
rename to unused/samples/hello/makefile
diff --git a/sdk/samples/library/makefile b/unused/samples/library/makefile
similarity index 100%
rename from sdk/samples/library/makefile
rename to unused/samples/library/makefile
diff --git a/sdk/samples/library/mylib.c b/unused/samples/library/mylib.c
similarity index 100%
rename from sdk/samples/library/mylib.c
rename to unused/samples/library/mylib.c
diff --git a/sdk/samples/library/mylib.h b/unused/samples/library/mylib.h
similarity index 100%
rename from sdk/samples/library/mylib.h
rename to unused/samples/library/mylib.h
diff --git a/sdk/readme.txt b/unused/samples/sdk-readme.txt
similarity index 100%
rename from sdk/readme.txt
rename to unused/samples/sdk-readme.txt
diff --git a/sdk/samples/basic/sqltest.bas b/unused/samples/sqltest.bas
similarity index 100%
rename from sdk/samples/basic/sqltest.bas
rename to unused/samples/sqltest.bas
diff --git a/sdk/samples/widget/icon24.bmp b/unused/samples/widget/icon24.bmp
similarity index 100%
rename from sdk/samples/widget/icon24.bmp
rename to unused/samples/widget/icon24.bmp
diff --git a/sdk/samples/widget/makefile b/unused/samples/widget/makefile
similarity index 100%
rename from sdk/samples/widget/makefile
rename to unused/samples/widget/makefile
diff --git a/sdk/samples/widget/mywgt.c b/unused/samples/widget/mywgt.c
similarity index 100%
rename from sdk/samples/widget/mywgt.c
rename to unused/samples/widget/mywgt.c
diff --git a/sdk/samples/widget/mywgt.res b/unused/samples/widget/mywgt.res
similarity index 100%
rename from sdk/samples/widget/mywgt.res
rename to unused/samples/widget/mywgt.res
diff --git a/termdemo/Makefile b/unused/termdemo/Makefile
similarity index 100%
rename from termdemo/Makefile
rename to unused/termdemo/Makefile
diff --git a/termdemo/README.md b/unused/termdemo/README.md
similarity index 100%
rename from termdemo/README.md
rename to unused/termdemo/README.md
diff --git a/termdemo/termdemo.c b/unused/termdemo/termdemo.c
similarity index 100%
rename from termdemo/termdemo.c
rename to unused/termdemo/termdemo.c