# HG changeset patch
# User drewp@bigasterisk.com
# Date 2024-05-13 02:02:10
# Node ID 4556eebe5d73dbea10c5e098be3c8009c73d3489
# Parent  623836db99afa79d4ea4a57baaaa88e472080f76

topdir reorgs; let pdm have its src/ dir; separate vite area from light9/

diff --git a/.pdm.toml b/.pdm.toml
deleted file mode 100644
--- a/.pdm.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[python]
-path = "/usr/bin/python3.10"
diff --git a/bin/bcf_puppet_demo b/bin/attic/bcf_puppet_demo
rename from bin/bcf_puppet_demo
rename to bin/attic/bcf_puppet_demo
diff --git a/bin/bumppad b/bin/attic/bumppad
rename from bin/bumppad
rename to bin/attic/bumppad
diff --git a/bin/captureDevice b/bin/attic/captureDevice
rename from bin/captureDevice
rename to bin/attic/captureDevice
diff --git a/bin/curvecalc b/bin/attic/curvecalc
rename from bin/curvecalc
rename to bin/attic/curvecalc
diff --git a/bin/curvecalc_all_subterms b/bin/attic/curvecalc_all_subterms
rename from bin/curvecalc_all_subterms
rename to bin/attic/curvecalc_all_subterms
diff --git a/bin/dmx_color_test.py b/bin/attic/dmx_color_test.py
rename from bin/dmx_color_test.py
rename to bin/attic/dmx_color_test.py
diff --git a/bin/dmxserver b/bin/attic/dmxserver
rename from bin/dmxserver
rename to bin/attic/dmxserver
diff --git a/bin/effectListing b/bin/attic/effectListing
rename from bin/effectListing
rename to bin/attic/effectListing
diff --git a/bin/effectSequencer b/bin/attic/effectSequencer
rename from bin/effectSequencer
rename to bin/attic/effectSequencer
--- a/bin/effectSequencer
+++ b/bin/attic/effectSequencer
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 pnpm exec vite -c light9/effect/sequencer/web/vite.config.ts &
 pdm run uvicorn light9.effect.sequencer.service:app --host 0.0.0.0 --port 8213 --no-access-log 
 wait
diff --git a/bin/effecteval b/bin/attic/effecteval
rename from bin/effecteval
rename to bin/attic/effecteval
diff --git a/bin/fade b/bin/attic/fade
rename from bin/fade
rename to bin/attic/fade
diff --git a/bin/gobutton b/bin/attic/gobutton
rename from bin/gobutton
rename to bin/attic/gobutton
diff --git a/bin/gtk_dnd_demo.py b/bin/attic/gtk_dnd_demo.py
rename from bin/gtk_dnd_demo.py
rename to bin/attic/gtk_dnd_demo.py
diff --git a/bin/inputdemo b/bin/attic/inputdemo
rename from bin/inputdemo
rename to bin/attic/inputdemo
diff --git a/bin/inputquneo b/bin/attic/inputquneo
rename from bin/inputquneo
rename to bin/attic/inputquneo
diff --git a/bin/kcclient b/bin/attic/kcclient
rename from bin/kcclient
rename to bin/attic/kcclient
diff --git a/bin/keyboardcomposer b/bin/attic/keyboardcomposer
rename from bin/keyboardcomposer
rename to bin/attic/keyboardcomposer
diff --git a/bin/lightsim b/bin/attic/lightsim
rename from bin/lightsim
rename to bin/attic/lightsim
diff --git a/bin/listsongs b/bin/attic/listsongs
rename from bin/listsongs
rename to bin/attic/listsongs
diff --git a/bin/live b/bin/attic/live
rename from bin/live
rename to bin/attic/live
diff --git a/bin/load_test_rdfdb b/bin/attic/load_test_rdfdb
rename from bin/load_test_rdfdb
rename to bin/attic/load_test_rdfdb
diff --git a/bin/midifade b/bin/attic/midifade
rename from bin/midifade
rename to bin/attic/midifade
diff --git a/bin/movesinks b/bin/attic/movesinks
rename from bin/movesinks
rename to bin/attic/movesinks
diff --git a/bin/mpd_timing_test b/bin/attic/mpd_timing_test
rename from bin/mpd_timing_test
rename to bin/attic/mpd_timing_test
diff --git a/bin/musictime b/bin/attic/musictime
rename from bin/musictime
rename to bin/attic/musictime
diff --git a/bin/paintserver b/bin/attic/paintserver
rename from bin/paintserver
rename to bin/attic/paintserver
diff --git a/bin/patchserver b/bin/attic/patchserver
rename from bin/patchserver
rename to bin/attic/patchserver
diff --git a/bin/picamserve b/bin/attic/picamserve
rename from bin/picamserve
rename to bin/attic/picamserve
diff --git a/bin/pytest b/bin/attic/pytest
rename from bin/pytest
rename to bin/attic/pytest
diff --git a/bin/python b/bin/attic/python
rename from bin/python
rename to bin/attic/python
diff --git a/bin/run_local.py b/bin/attic/run_local.py
rename from bin/run_local.py
rename to bin/attic/run_local.py
diff --git a/bin/staticclient b/bin/attic/staticclient
rename from bin/staticclient
rename to bin/attic/staticclient
diff --git a/bin/subcomposer b/bin/attic/subcomposer
rename from bin/subcomposer
rename to bin/attic/subcomposer
diff --git a/bin/subserver b/bin/attic/subserver
rename from bin/subserver
rename to bin/attic/subserver
diff --git a/bin/timeline b/bin/attic/timeline
rename from bin/timeline
rename to bin/attic/timeline
diff --git a/bin/tkdnd_minimal_drop.py b/bin/attic/tkdnd_minimal_drop.py
rename from bin/tkdnd_minimal_drop.py
rename to bin/attic/tkdnd_minimal_drop.py
diff --git a/bin/tracker b/bin/attic/tracker
rename from bin/tracker
rename to bin/attic/tracker
diff --git a/bin/vidref b/bin/attic/vidref
rename from bin/vidref
rename to bin/attic/vidref
diff --git a/bin/vidrefsetup b/bin/attic/vidrefsetup
rename from bin/vidrefsetup
rename to bin/attic/vidrefsetup
diff --git a/bin/wavecurve b/bin/attic/wavecurve
rename from bin/wavecurve
rename to bin/attic/wavecurve
diff --git a/bin/webcontrol b/bin/attic/webcontrol
rename from bin/webcontrol
rename to bin/attic/webcontrol
diff --git a/bin/clientdemo b/bin/debug/clientdemo
rename from bin/clientdemo
rename to bin/debug/clientdemo
diff --git a/bin/collector_loadtest.py b/bin/debug/collector_loadtest.py
rename from bin/collector_loadtest.py
rename to bin/debug/collector_loadtest.py
diff --git a/light9/Effects.py b/src/light9/Effects.py
rename from light9/Effects.py
rename to src/light9/Effects.py
diff --git a/light9/Fadable.py b/src/light9/Fadable.py
rename from light9/Fadable.py
rename to src/light9/Fadable.py
diff --git a/light9/FlyingFader.py b/src/light9/FlyingFader.py
rename from light9/FlyingFader.py
rename to src/light9/FlyingFader.py
diff --git a/light9/Patch.py b/src/light9/Patch.py
rename from light9/Patch.py
rename to src/light9/Patch.py
diff --git a/light9/Submaster.py b/src/light9/Submaster.py
rename from light9/Submaster.py
rename to src/light9/Submaster.py
diff --git a/light9/TLUtility.py b/src/light9/TLUtility.py
rename from light9/TLUtility.py
rename to src/light9/TLUtility.py
diff --git a/light9/__init__.py b/src/light9/__init__.py
rename from light9/__init__.py
rename to src/light9/__init__.py
diff --git a/light9/ascoltami/__init__.py b/src/light9/ascoltami/__init__.py
rename from light9/ascoltami/__init__.py
rename to src/light9/ascoltami/__init__.py
diff --git a/light9/ascoltami/main.py b/src/light9/ascoltami/main.py
rename from light9/ascoltami/main.py
rename to src/light9/ascoltami/main.py
diff --git a/light9/ascoltami/main_test.py b/src/light9/ascoltami/main_test.py
rename from light9/ascoltami/main_test.py
rename to src/light9/ascoltami/main_test.py
diff --git a/light9/ascoltami/musictime_client.py b/src/light9/ascoltami/musictime_client.py
rename from light9/ascoltami/musictime_client.py
rename to src/light9/ascoltami/musictime_client.py
diff --git a/light9/ascoltami/player.py b/src/light9/ascoltami/player.py
rename from light9/ascoltami/player.py
rename to src/light9/ascoltami/player.py
diff --git a/light9/ascoltami/playlist.py b/src/light9/ascoltami/playlist.py
rename from light9/ascoltami/playlist.py
rename to src/light9/ascoltami/playlist.py
diff --git a/light9/ascoltami/webapp.py b/src/light9/ascoltami/webapp.py
rename from light9/ascoltami/webapp.py
rename to src/light9/ascoltami/webapp.py
diff --git a/light9/ascoltami/webapp_test.py b/src/light9/ascoltami/webapp_test.py
rename from light9/ascoltami/webapp_test.py
rename to src/light9/ascoltami/webapp_test.py
diff --git a/light9/chase.py b/src/light9/chase.py
rename from light9/chase.py
rename to src/light9/chase.py
diff --git a/light9/clientsession.py b/src/light9/clientsession.py
rename from light9/clientsession.py
rename to src/light9/clientsession.py
diff --git a/light9/coffee.py b/src/light9/coffee.py
rename from light9/coffee.py
rename to src/light9/coffee.py
diff --git a/light9/collector/__init__.py b/src/light9/collector/__init__.py
rename from light9/collector/__init__.py
rename to src/light9/collector/__init__.py
diff --git a/light9/collector/collector.py b/src/light9/collector/collector.py
rename from light9/collector/collector.py
rename to src/light9/collector/collector.py
diff --git a/light9/collector/collector_client.py b/src/light9/collector/collector_client.py
rename from light9/collector/collector_client.py
rename to src/light9/collector/collector_client.py
diff --git a/light9/collector/collector_client_asyncio.py b/src/light9/collector/collector_client_asyncio.py
rename from light9/collector/collector_client_asyncio.py
rename to src/light9/collector/collector_client_asyncio.py
diff --git a/light9/collector/collector_test.py b/src/light9/collector/collector_test.py
rename from light9/collector/collector_test.py
rename to src/light9/collector/collector_test.py
diff --git a/light9/collector/device.py b/src/light9/collector/device.py
rename from light9/collector/device.py
rename to src/light9/collector/device.py
diff --git a/light9/collector/device_test.py b/src/light9/collector/device_test.py
rename from light9/collector/device_test.py
rename to src/light9/collector/device_test.py
diff --git a/light9/collector/dmx_controller_output.py b/src/light9/collector/dmx_controller_output.py
rename from light9/collector/dmx_controller_output.py
rename to src/light9/collector/dmx_controller_output.py
diff --git a/light9/collector/output.py b/src/light9/collector/output.py
rename from light9/collector/output.py
rename to src/light9/collector/output.py
diff --git a/light9/collector/output_test.py b/src/light9/collector/output_test.py
rename from light9/collector/output_test.py
rename to src/light9/collector/output_test.py
diff --git a/light9/collector/service.py b/src/light9/collector/service.py
rename from light9/collector/service.py
rename to src/light9/collector/service.py
--- a/light9/collector/service.py
+++ b/src/light9/collector/service.py
@@ -108,7 +108,7 @@ def main():
 
     graph = SyncedGraph(networking.rdfdb.url, "collector")
 
-    devPath, usbAddress = findDevice()
+    #devPath, usbAddress = findDevice()
             # if user doesn't have r/w, fail now
     try:
         # todo: drive outputs with config files
@@ -118,7 +118,7 @@ def main():
             #           port=6445,
             #           rate=rate),
             #sudo chmod a+rw /dev/bus/usb/003/021
-            Udmx(L9['output/dmxA/'], bus=1, address=usbAddress, lastDmxChannel=200, rate=RATE),
+#            Udmx(L9['output/dmxA/'], bus=1, address=usbAddress, lastDmxChannel=200, rate=RATE),
         ]
     except Exception:
         log.error("setting up outputs:")
diff --git a/light9/collector/weblisteners.py b/src/light9/collector/weblisteners.py
rename from light9/collector/weblisteners.py
rename to src/light9/collector/weblisteners.py
diff --git a/light9/cursor1.xbm b/src/light9/cursor1.xbm
rename from light9/cursor1.xbm
rename to src/light9/cursor1.xbm
diff --git a/light9/curvecalc/__init__.py b/src/light9/curvecalc/__init__.py
rename from light9/curvecalc/__init__.py
rename to src/light9/curvecalc/__init__.py
diff --git a/light9/curvecalc/client.py b/src/light9/curvecalc/client.py
rename from light9/curvecalc/client.py
rename to src/light9/curvecalc/client.py
diff --git a/light9/curvecalc/cursors.py b/src/light9/curvecalc/cursors.py
rename from light9/curvecalc/cursors.py
rename to src/light9/curvecalc/cursors.py
diff --git a/light9/curvecalc/curve.py b/src/light9/curvecalc/curve.py
rename from light9/curvecalc/curve.py
rename to src/light9/curvecalc/curve.py
diff --git a/light9/curvecalc/curvecalc.glade b/src/light9/curvecalc/curvecalc.glade
rename from light9/curvecalc/curvecalc.glade
rename to src/light9/curvecalc/curvecalc.glade
diff --git a/light9/curvecalc/curveedit.py b/src/light9/curvecalc/curveedit.py
rename from light9/curvecalc/curveedit.py
rename to src/light9/curvecalc/curveedit.py
diff --git a/light9/curvecalc/curveview.py b/src/light9/curvecalc/curveview.py
rename from light9/curvecalc/curveview.py
rename to src/light9/curvecalc/curveview.py
diff --git a/light9/curvecalc/musicaccess.py b/src/light9/curvecalc/musicaccess.py
rename from light9/curvecalc/musicaccess.py
rename to src/light9/curvecalc/musicaccess.py
diff --git a/light9/curvecalc/output.py b/src/light9/curvecalc/output.py
rename from light9/curvecalc/output.py
rename to src/light9/curvecalc/output.py
diff --git a/light9/curvecalc/subterm.py b/src/light9/curvecalc/subterm.py
rename from light9/curvecalc/subterm.py
rename to src/light9/curvecalc/subterm.py
diff --git a/light9/curvecalc/subtermview.py b/src/light9/curvecalc/subtermview.py
rename from light9/curvecalc/subtermview.py
rename to src/light9/curvecalc/subtermview.py
diff --git a/light9/curvecalc/zoomcontrol.py b/src/light9/curvecalc/zoomcontrol.py
rename from light9/curvecalc/zoomcontrol.py
rename to src/light9/curvecalc/zoomcontrol.py
diff --git a/light9/dmxchanedit.py b/src/light9/dmxchanedit.py
rename from light9/dmxchanedit.py
rename to src/light9/dmxchanedit.py
diff --git a/light9/dmxclient.py b/src/light9/dmxclient.py
rename from light9/dmxclient.py
rename to src/light9/dmxclient.py
diff --git a/light9/editchoice.py b/src/light9/editchoice.py
rename from light9/editchoice.py
rename to src/light9/editchoice.py
diff --git a/light9/editchoicegtk.py b/src/light9/editchoicegtk.py
rename from light9/editchoicegtk.py
rename to src/light9/editchoicegtk.py
diff --git a/light9/effect/__init__.py b/src/light9/effect/__init__.py
rename from light9/effect/__init__.py
rename to src/light9/effect/__init__.py
diff --git a/light9/effect/edit.py b/src/light9/effect/edit.py
rename from light9/effect/edit.py
rename to src/light9/effect/edit.py
diff --git a/light9/effect/effect_function_library.py b/src/light9/effect/effect_function_library.py
rename from light9/effect/effect_function_library.py
rename to src/light9/effect/effect_function_library.py
diff --git a/light9/effect/effect_function_library_test.py b/src/light9/effect/effect_function_library_test.py
rename from light9/effect/effect_function_library_test.py
rename to src/light9/effect/effect_function_library_test.py
diff --git a/light9/effect/effect_functions.py b/src/light9/effect/effect_functions.py
rename from light9/effect/effect_functions.py
rename to src/light9/effect/effect_functions.py
diff --git a/light9/effect/effecteval.py b/src/light9/effect/effecteval.py
rename from light9/effect/effecteval.py
rename to src/light9/effect/effecteval.py
diff --git a/light9/effect/effecteval2.py b/src/light9/effect/effecteval2.py
rename from light9/effect/effecteval2.py
rename to src/light9/effect/effecteval2.py
diff --git a/light9/effect/effecteval_test.py b/src/light9/effect/effecteval_test.py
rename from light9/effect/effecteval_test.py
rename to src/light9/effect/effecteval_test.py
diff --git a/light9/effect/scale.py b/src/light9/effect/scale.py
rename from light9/effect/scale.py
rename to src/light9/effect/scale.py
diff --git a/light9/effect/sequencer/__init__.py b/src/light9/effect/sequencer/__init__.py
rename from light9/effect/sequencer/__init__.py
rename to src/light9/effect/sequencer/__init__.py
diff --git a/light9/effect/sequencer/eval_faders.py b/src/light9/effect/sequencer/eval_faders.py
rename from light9/effect/sequencer/eval_faders.py
rename to src/light9/effect/sequencer/eval_faders.py
diff --git a/light9/effect/sequencer/eval_faders_test.py b/src/light9/effect/sequencer/eval_faders_test.py
rename from light9/effect/sequencer/eval_faders_test.py
rename to src/light9/effect/sequencer/eval_faders_test.py
diff --git a/light9/effect/sequencer/note.py b/src/light9/effect/sequencer/note.py
rename from light9/effect/sequencer/note.py
rename to src/light9/effect/sequencer/note.py
diff --git a/light9/effect/sequencer/note_test.py b/src/light9/effect/sequencer/note_test.py
rename from light9/effect/sequencer/note_test.py
rename to src/light9/effect/sequencer/note_test.py
diff --git a/light9/effect/sequencer/sequencer.py b/src/light9/effect/sequencer/sequencer.py
rename from light9/effect/sequencer/sequencer.py
rename to src/light9/effect/sequencer/sequencer.py
diff --git a/light9/effect/sequencer/service.py b/src/light9/effect/sequencer/service.py
rename from light9/effect/sequencer/service.py
rename to src/light9/effect/sequencer/service.py
diff --git a/light9/effect/sequencer/service_test.py b/src/light9/effect/sequencer/service_test.py
rename from light9/effect/sequencer/service_test.py
rename to src/light9/effect/sequencer/service_test.py
diff --git a/light9/effect/sequencer/web/Light9SequencerUi.ts b/src/light9/effect/sequencer/web/Light9SequencerUi.ts
rename from light9/effect/sequencer/web/Light9SequencerUi.ts
rename to src/light9/effect/sequencer/web/Light9SequencerUi.ts
diff --git a/light9/effect/sequencer/web/index.html b/src/light9/effect/sequencer/web/index.html
rename from light9/effect/sequencer/web/index.html
rename to src/light9/effect/sequencer/web/index.html
diff --git a/light9/effect/sequencer/web/vite.config.ts b/src/light9/effect/sequencer/web/vite.config.ts
rename from light9/effect/sequencer/web/vite.config.ts
rename to src/light9/effect/sequencer/web/vite.config.ts
diff --git a/light9/effect/settings.py b/src/light9/effect/settings.py
rename from light9/effect/settings.py
rename to src/light9/effect/settings.py
diff --git a/light9/effect/settings_test.py b/src/light9/effect/settings_test.py
rename from light9/effect/settings_test.py
rename to src/light9/effect/settings_test.py
diff --git a/light9/effecteval/__init__.py b/src/light9/effecteval/__init__.py
rename from light9/effecteval/__init__.py
rename to src/light9/effecteval/__init__.py
diff --git a/light9/effecteval/effect-components.html b/src/light9/effecteval/effect-components.html
rename from light9/effecteval/effect-components.html
rename to src/light9/effecteval/effect-components.html
diff --git a/light9/effecteval/effect.coffee b/src/light9/effecteval/effect.coffee
rename from light9/effecteval/effect.coffee
rename to src/light9/effecteval/effect.coffee
diff --git a/light9/effecteval/effect.html b/src/light9/effecteval/effect.html
rename from light9/effecteval/effect.html
rename to src/light9/effecteval/effect.html
diff --git a/light9/effecteval/effect.py b/src/light9/effecteval/effect.py
rename from light9/effecteval/effect.py
rename to src/light9/effecteval/effect.py
diff --git a/light9/effecteval/effectloop.py b/src/light9/effecteval/effectloop.py
rename from light9/effecteval/effectloop.py
rename to src/light9/effecteval/effectloop.py
diff --git a/light9/effecteval/index.html b/src/light9/effecteval/index.html
rename from light9/effecteval/index.html
rename to src/light9/effecteval/index.html
diff --git a/light9/effecteval/test_effect.py b/src/light9/effecteval/test_effect.py
rename from light9/effecteval/test_effect.py
rename to src/light9/effecteval/test_effect.py
diff --git a/light9/gtkpyconsole.py b/src/light9/gtkpyconsole.py
rename from light9/gtkpyconsole.py
rename to src/light9/gtkpyconsole.py
diff --git a/light9/homepage/write_config.py b/src/light9/homepage/write_config.py
rename from light9/homepage/write_config.py
rename to src/light9/homepage/write_config.py
diff --git a/light9/homepage/write_config_test.py b/src/light9/homepage/write_config_test.py
rename from light9/homepage/write_config_test.py
rename to src/light9/homepage/write_config_test.py
diff --git a/light9/io/Makefile b/src/light9/io/Makefile
rename from light9/io/Makefile
rename to src/light9/io/Makefile
diff --git a/light9/io/__init__.py b/src/light9/io/__init__.py
rename from light9/io/__init__.py
rename to src/light9/io/__init__.py
diff --git a/light9/io/motordrive b/src/light9/io/motordrive
rename from light9/io/motordrive
rename to src/light9/io/motordrive
diff --git a/light9/io/parport.c b/src/light9/io/parport.c
rename from light9/io/parport.c
rename to src/light9/io/parport.c
diff --git a/light9/io/parport.i b/src/light9/io/parport.i
rename from light9/io/parport.i
rename to src/light9/io/parport.i
diff --git a/light9/io/serport.i b/src/light9/io/serport.i
rename from light9/io/serport.i
rename to src/light9/io/serport.i
diff --git a/light9/io/udmx.py b/src/light9/io/udmx.py
rename from light9/io/udmx.py
rename to src/light9/io/udmx.py
diff --git a/light9/localsyncedgraph.py b/src/light9/localsyncedgraph.py
rename from light9/localsyncedgraph.py
rename to src/light9/localsyncedgraph.py
diff --git a/light9/metrics.py b/src/light9/metrics.py
rename from light9/metrics.py
rename to src/light9/metrics.py
diff --git a/light9/midifade/midifade.py b/src/light9/midifade/midifade.py
rename from light9/midifade/midifade.py
rename to src/light9/midifade/midifade.py
diff --git a/light9/midifade/midifade_test.py b/src/light9/midifade/midifade_test.py
rename from light9/midifade/midifade_test.py
rename to src/light9/midifade/midifade_test.py
diff --git a/light9/mock_syncedgraph.py b/src/light9/mock_syncedgraph.py
rename from light9/mock_syncedgraph.py
rename to src/light9/mock_syncedgraph.py
diff --git a/light9/namespaces.py b/src/light9/namespaces.py
rename from light9/namespaces.py
rename to src/light9/namespaces.py
diff --git a/light9/networking.py b/src/light9/networking.py
rename from light9/networking.py
rename to src/light9/networking.py
diff --git a/light9/newtypes.py b/src/light9/newtypes.py
rename from light9/newtypes.py
rename to src/light9/newtypes.py
diff --git a/light9/observable.py b/src/light9/observable.py
rename from light9/observable.py
rename to src/light9/observable.py
diff --git a/light9/paint/__init__.py b/src/light9/paint/__init__.py
rename from light9/paint/__init__.py
rename to src/light9/paint/__init__.py
diff --git a/light9/paint/capture.py b/src/light9/paint/capture.py
rename from light9/paint/capture.py
rename to src/light9/paint/capture.py
diff --git a/light9/paint/solve.py b/src/light9/paint/solve.py
rename from light9/paint/solve.py
rename to src/light9/paint/solve.py
diff --git a/light9/paint/solve_test.py b/src/light9/paint/solve_test.py
rename from light9/paint/solve_test.py
rename to src/light9/paint/solve_test.py
diff --git a/light9/prof.py b/src/light9/prof.py
rename from light9/prof.py
rename to src/light9/prof.py
diff --git a/light9/rdfdb/service.py b/src/light9/rdfdb/service.py
rename from light9/rdfdb/service.py
rename to src/light9/rdfdb/service.py
diff --git a/light9/rdfdb/service_test.py b/src/light9/rdfdb/service_test.py
rename from light9/rdfdb/service_test.py
rename to src/light9/rdfdb/service_test.py
diff --git a/light9/recentfps.py b/src/light9/recentfps.py
rename from light9/recentfps.py
rename to src/light9/recentfps.py
diff --git a/light9/run_local.py b/src/light9/run_local.py
rename from light9/run_local.py
rename to src/light9/run_local.py
--- a/light9/run_local.py
+++ b/src/light9/run_local.py
@@ -52,7 +52,7 @@ def setTerminalTitle(s):
         s = s.replace('/home/drewp/own/proj/','')
         print("\033]0;%s\007" % s)  # not escaped/protected correctly
         hue = (hash(progName) % 255) / 255
-        r, g, b = [int(x * 255) for x in hsv_to_rgb(hue, s=.2, v=.1)]
+        r, g, b = [int(x * 255) for x in hsv_to_rgb(hue, s=.4, v=.1)]
         print(f"\033]11;#{r:02x}{g:02x}{b:02x}\007")
 
 
diff --git a/light9/showconfig.py b/src/light9/showconfig.py
rename from light9/showconfig.py
rename to src/light9/showconfig.py
diff --git a/light9/subclient.py b/src/light9/subclient.py
rename from light9/subclient.py
rename to src/light9/subclient.py
diff --git a/light9/subcomposer/__init__.py b/src/light9/subcomposer/__init__.py
rename from light9/subcomposer/__init__.py
rename to src/light9/subcomposer/__init__.py
diff --git a/light9/subcomposer/index.html b/src/light9/subcomposer/index.html
rename from light9/subcomposer/index.html
rename to src/light9/subcomposer/index.html
diff --git a/light9/subcomposer/subcomposerweb.py b/src/light9/subcomposer/subcomposerweb.py
rename from light9/subcomposer/subcomposerweb.py
rename to src/light9/subcomposer/subcomposerweb.py
diff --git a/light9/tkdnd.py b/src/light9/tkdnd.py
rename from light9/tkdnd.py
rename to src/light9/tkdnd.py
diff --git a/light9/typedgraph.py b/src/light9/typedgraph.py
rename from light9/typedgraph.py
rename to src/light9/typedgraph.py
diff --git a/light9/typedgraph_test.py b/src/light9/typedgraph_test.py
rename from light9/typedgraph_test.py
rename to src/light9/typedgraph_test.py
diff --git a/light9/uihelpers.py b/src/light9/uihelpers.py
rename from light9/uihelpers.py
rename to src/light9/uihelpers.py
diff --git a/light9/updatefreq.py b/src/light9/updatefreq.py
rename from light9/updatefreq.py
rename to src/light9/updatefreq.py
diff --git a/light9/vidref/__init__.py b/src/light9/vidref/__init__.py
rename from light9/vidref/__init__.py
rename to src/light9/vidref/__init__.py
diff --git a/light9/vidref/gui.js b/src/light9/vidref/gui.js
rename from light9/vidref/gui.js
rename to src/light9/vidref/gui.js
diff --git a/light9/vidref/index.html b/src/light9/vidref/index.html
rename from light9/vidref/index.html
rename to src/light9/vidref/index.html
diff --git a/light9/vidref/main.py b/src/light9/vidref/main.py
rename from light9/vidref/main.py
rename to src/light9/vidref/main.py
diff --git a/light9/vidref/moviestore.py b/src/light9/vidref/moviestore.py
rename from light9/vidref/moviestore.py
rename to src/light9/vidref/moviestore.py
diff --git a/light9/vidref/remotepivideo.py b/src/light9/vidref/remotepivideo.py
rename from light9/vidref/remotepivideo.py
rename to src/light9/vidref/remotepivideo.py
diff --git a/light9/vidref/setup.html b/src/light9/vidref/setup.html
rename from light9/vidref/setup.html
rename to src/light9/vidref/setup.html
diff --git a/light9/vidref/videorecorder.py b/src/light9/vidref/videorecorder.py
rename from light9/vidref/videorecorder.py
rename to src/light9/vidref/videorecorder.py
diff --git a/light9/vidref/vidref.glade b/src/light9/vidref/vidref.glade
rename from light9/vidref/vidref.glade
rename to src/light9/vidref/vidref.glade
diff --git a/light9/vidref/vidref.html b/src/light9/vidref/vidref.html
rename from light9/vidref/vidref.html
rename to src/light9/vidref/vidref.html
diff --git a/light9/vidref/vidref.ui b/src/light9/vidref/vidref.ui
rename from light9/vidref/vidref.ui
rename to src/light9/vidref/vidref.ui
diff --git a/light9/wavelength.py b/src/light9/wavelength.py
rename from light9/wavelength.py
rename to src/light9/wavelength.py
diff --git a/light9/wavepoints.py b/src/light9/wavepoints.py
rename from light9/wavepoints.py
rename to src/light9/wavepoints.py
diff --git a/light9/webcontrol.html b/src/light9/webcontrol.html
rename from light9/webcontrol.html
rename to src/light9/webcontrol.html
diff --git a/light9/zmqtransport.py b/src/light9/zmqtransport.py
rename from light9/zmqtransport.py
rename to src/light9/zmqtransport.py
diff --git a/light9/web/AutoDependencies.ts b/web/AutoDependencies.ts
rename from light9/web/AutoDependencies.ts
rename to web/AutoDependencies.ts
diff --git a/light9/web/EditChoice.ts b/web/EditChoice.ts
rename from light9/web/EditChoice.ts
rename to web/EditChoice.ts
diff --git a/light9/web/Light9CursorCanvas.ts b/web/Light9CursorCanvas.ts
rename from light9/web/Light9CursorCanvas.ts
rename to web/Light9CursorCanvas.ts
diff --git a/light9/web/RdfDbChannel.ts b/web/RdfDbChannel.ts
rename from light9/web/RdfDbChannel.ts
rename to web/RdfDbChannel.ts
diff --git a/light9/web/RdfdbSyncedGraph.ts b/web/RdfdbSyncedGraph.ts
rename from light9/web/RdfdbSyncedGraph.ts
rename to web/RdfdbSyncedGraph.ts
diff --git a/light9/web/ResourceDisplay.ts b/web/ResourceDisplay.ts
rename from light9/web/ResourceDisplay.ts
rename to web/ResourceDisplay.ts
diff --git a/light9/web/SyncedGraph.ts b/web/SyncedGraph.ts
rename from light9/web/SyncedGraph.ts
rename to web/SyncedGraph.ts
diff --git a/light9/web/TiledHome.ts b/web/TiledHome.ts
rename from light9/web/TiledHome.ts
rename to web/TiledHome.ts
diff --git a/light9/web/ascoltami/Light9AscoltamiUi.ts b/web/ascoltami/Light9AscoltamiUi.ts
rename from light9/web/ascoltami/Light9AscoltamiUi.ts
rename to web/ascoltami/Light9AscoltamiUi.ts
diff --git a/light9/web/ascoltami/index.html b/web/ascoltami/index.html
rename from light9/web/ascoltami/index.html
rename to web/ascoltami/index.html
diff --git a/light9/web/ascoltami/main.ts b/web/ascoltami/main.ts
rename from light9/web/ascoltami/main.ts
rename to web/ascoltami/main.ts
diff --git a/light9/web/collector/Light9CollectorDevice.ts b/web/collector/Light9CollectorDevice.ts
rename from light9/web/collector/Light9CollectorDevice.ts
rename to web/collector/Light9CollectorDevice.ts
diff --git a/light9/web/collector/Light9CollectorUi.ts b/web/collector/Light9CollectorUi.ts
rename from light9/web/collector/Light9CollectorUi.ts
rename to web/collector/Light9CollectorUi.ts
--- a/light9/web/collector/Light9CollectorUi.ts
+++ b/web/collector/Light9CollectorUi.ts
@@ -19,7 +19,7 @@ export class Light9CollectorUi extends L
   graph!: SyncedGraph;
   render() {
     return html`<rdfdb-synced-graph></rdfdb-synced-graph>
-      <h1>Collector <a href="metrics">[metrics]</a></h1>
+      <h1>Collector</h1>
 
       <h2>Devices</h2>
       <div style="column-width: 11em">${this.devices.map((d) => html`<light9-collector-device .uri=${d}></light9-collector-device>`)}</div> `;
diff --git a/light9/web/collector/index.html b/web/collector/index.html
rename from light9/web/collector/index.html
rename to web/collector/index.html
diff --git a/light9/web/colorpick_crosshair_large.svg b/web/colorpick_crosshair_large.svg
rename from light9/web/colorpick_crosshair_large.svg
rename to web/colorpick_crosshair_large.svg
diff --git a/light9/web/colorpick_crosshair_small.svg b/web/colorpick_crosshair_small.svg
rename from light9/web/colorpick_crosshair_small.svg
rename to web/colorpick_crosshair_small.svg
diff --git a/light9/web/colorpick_rainbow_large.png b/web/colorpick_rainbow_large.png
rename from light9/web/colorpick_rainbow_large.png
rename to web/colorpick_rainbow_large.png
diff --git a/light9/web/colorpick_rainbow_small.png b/web/colorpick_rainbow_small.png
rename from light9/web/colorpick_rainbow_small.png
rename to web/colorpick_rainbow_small.png
diff --git a/light9/web/drawing.ts b/web/drawing.ts
rename from light9/web/drawing.ts
rename to web/drawing.ts
diff --git a/light9/web/edit-choice-demo.html b/web/edit-choice-demo.html
rename from light9/web/edit-choice-demo.html
rename to web/edit-choice-demo.html
diff --git a/light9/web/edit-choice.coffee b/web/edit-choice.coffee
rename from light9/web/edit-choice.coffee
rename to web/edit-choice.coffee
diff --git a/light9/web/edit-choice_test.html b/web/edit-choice_test.html
rename from light9/web/edit-choice_test.html
rename to web/edit-choice_test.html
diff --git a/light9/web/effects/Light9EffectListing.ts b/web/effects/Light9EffectListing.ts
rename from light9/web/effects/Light9EffectListing.ts
rename to web/effects/Light9EffectListing.ts
diff --git a/light9/web/effects/index.html b/web/effects/index.html
rename from light9/web/effects/index.html
rename to web/effects/index.html
diff --git a/light9/web/fade/Light9EffectFader.ts b/web/fade/Light9EffectFader.ts
rename from light9/web/fade/Light9EffectFader.ts
rename to web/fade/Light9EffectFader.ts
diff --git a/light9/web/fade/Light9FadeUi.ts b/web/fade/Light9FadeUi.ts
rename from light9/web/fade/Light9FadeUi.ts
rename to web/fade/Light9FadeUi.ts
diff --git a/light9/web/fade/Light9Fader.ts b/web/fade/Light9Fader.ts
rename from light9/web/fade/Light9Fader.ts
rename to web/fade/Light9Fader.ts
diff --git a/light9/web/fade/index.html b/web/fade/index.html
rename from light9/web/fade/index.html
rename to web/fade/index.html
diff --git a/light9/web/floating_color_picker.ts b/web/floating_color_picker.ts
rename from light9/web/floating_color_picker.ts
rename to web/floating_color_picker.ts
diff --git a/light9/web/graph_test.coffee b/web/graph_test.coffee
rename from light9/web/graph_test.coffee
rename to web/graph_test.coffee
diff --git a/light9/web/index.html b/web/index.html
rename from light9/web/index.html
rename to web/index.html
diff --git a/light9/web/lib/.bowerrc b/web/lib/.bowerrc
rename from light9/web/lib/.bowerrc
rename to web/lib/.bowerrc
diff --git a/light9/web/lib/bower.json b/web/lib/bower.json
rename from light9/web/lib/bower.json
rename to web/lib/bower.json
diff --git a/light9/web/lib/onecolor.d.ts b/web/lib/onecolor.d.ts
rename from light9/web/lib/onecolor.d.ts
rename to web/lib/onecolor.d.ts
diff --git a/light9/web/lib/parse-prometheus-text-format.d.ts b/web/lib/parse-prometheus-text-format.d.ts
rename from light9/web/lib/parse-prometheus-text-format.d.ts
rename to web/lib/parse-prometheus-text-format.d.ts
diff --git a/light9/web/lib/sylvester.d.ts b/web/lib/sylvester.d.ts
rename from light9/web/lib/sylvester.d.ts
rename to web/lib/sylvester.d.ts
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/MIT-LICENSE.txt b/web/lib/tapmodo-Jcrop-1902fbc/MIT-LICENSE.txt
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/MIT-LICENSE.txt
rename to web/lib/tapmodo-Jcrop-1902fbc/MIT-LICENSE.txt
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/README.md b/web/lib/tapmodo-Jcrop-1902fbc/README.md
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/README.md
rename to web/lib/tapmodo-Jcrop-1902fbc/README.md
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/css/Jcrop.gif b/web/lib/tapmodo-Jcrop-1902fbc/css/Jcrop.gif
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/css/Jcrop.gif
rename to web/lib/tapmodo-Jcrop-1902fbc/css/Jcrop.gif
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.css b/web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.css
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.css
rename to web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.css
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.min.css b/web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.min.css
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.min.css
rename to web/lib/tapmodo-Jcrop-1902fbc/css/jquery.Jcrop.min.css
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/index.html b/web/lib/tapmodo-Jcrop-1902fbc/index.html
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/index.html
rename to web/lib/tapmodo-Jcrop-1902fbc/index.html
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.js b/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.js
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.js
rename to web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.js
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.min.js b/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.min.js
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.min.js
rename to web/lib/tapmodo-Jcrop-1902fbc/js/jquery.Jcrop.min.js
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.color.js b/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.color.js
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.color.js
rename to web/lib/tapmodo-Jcrop-1902fbc/js/jquery.color.js
diff --git a/light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.min.js b/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.min.js
rename from light9/web/lib/tapmodo-Jcrop-1902fbc/js/jquery.min.js
rename to web/lib/tapmodo-Jcrop-1902fbc/js/jquery.min.js
diff --git a/light9/web/light9-collector-client.html b/web/light9-collector-client.html
rename from light9/web/light9-collector-client.html
rename to web/light9-collector-client.html
diff --git a/light9/web/light9-color-picker.ts b/web/light9-color-picker.ts
rename from light9/web/light9-color-picker.ts
rename to web/light9-color-picker.ts
diff --git a/light9/web/light9-color-picker_test.html b/web/light9-color-picker_test.html
rename from light9/web/light9-color-picker_test.html
rename to web/light9-color-picker_test.html
diff --git a/light9/web/light9-music.coffee b/web/light9-music.coffee
rename from light9/web/light9-music.coffee
rename to web/light9-music.coffee
diff --git a/light9/web/light9-music.html b/web/light9-music.html
rename from light9/web/light9-music.html
rename to web/light9-music.html
diff --git a/light9/web/light9-timeline-audio.ts b/web/light9-timeline-audio.ts
rename from light9/web/light9-timeline-audio.ts
rename to web/light9-timeline-audio.ts
diff --git a/light9/web/light9-vidref-live.js b/web/light9-vidref-live.js
rename from light9/web/light9-vidref-live.js
rename to web/light9-vidref-live.js
diff --git a/light9/web/light9-vidref-replay-stack.js b/web/light9-vidref-replay-stack.js
rename from light9/web/light9-vidref-replay-stack.js
rename to web/light9-vidref-replay-stack.js
diff --git a/light9/web/light9-vidref-replay.js b/web/light9-vidref-replay.js
rename from light9/web/light9-vidref-replay.js
rename to web/light9-vidref-replay.js
diff --git a/light9/web/live/Effect.ts b/web/live/Effect.ts
rename from light9/web/live/Effect.ts
rename to web/live/Effect.ts
diff --git a/light9/web/live/Light9AttrControl.ts b/web/live/Light9AttrControl.ts
rename from light9/web/live/Light9AttrControl.ts
rename to web/live/Light9AttrControl.ts
diff --git a/light9/web/live/Light9DeviceControl.ts b/web/live/Light9DeviceControl.ts
rename from light9/web/live/Light9DeviceControl.ts
rename to web/live/Light9DeviceControl.ts
diff --git a/light9/web/live/Light9DeviceSettings.ts b/web/live/Light9DeviceSettings.ts
rename from light9/web/live/Light9DeviceSettings.ts
rename to web/live/Light9DeviceSettings.ts
diff --git a/light9/web/live/Light9Listbox.ts b/web/live/Light9Listbox.ts
rename from light9/web/live/Light9Listbox.ts
rename to web/live/Light9Listbox.ts
diff --git a/light9/web/live/README.md b/web/live/README.md
rename from light9/web/live/README.md
rename to web/live/README.md
diff --git a/light9/web/live/index.html b/web/live/index.html
rename from light9/web/live/index.html
rename to web/live/index.html
diff --git a/light9/web/metrics/ServiceButtonRow.ts b/web/metrics/ServiceButtonRow.ts
rename from light9/web/metrics/ServiceButtonRow.ts
rename to web/metrics/ServiceButtonRow.ts
diff --git a/light9/web/metrics/StatsLine.ts b/web/metrics/StatsLine.ts
rename from light9/web/metrics/StatsLine.ts
rename to web/metrics/StatsLine.ts
diff --git a/light9/web/metrics/StatsProcess.ts b/web/metrics/StatsProcess.ts
rename from light9/web/metrics/StatsProcess.ts
rename to web/metrics/StatsProcess.ts
diff --git a/light9/web/metrics/index.html b/web/metrics/index.html
rename from light9/web/metrics/index.html
rename to web/metrics/index.html
diff --git a/light9/web/mime.types b/web/mime.types
rename from light9/web/mime.types
rename to web/mime.types
diff --git a/light9/web/paint/bg1.jpg b/web/paint/bg1.jpg
rename from light9/web/paint/bg1.jpg
rename to web/paint/bg1.jpg
diff --git a/light9/web/paint/bg2.jpg b/web/paint/bg2.jpg
rename from light9/web/paint/bg2.jpg
rename to web/paint/bg2.jpg
diff --git a/light9/web/paint/bg3.jpg b/web/paint/bg3.jpg
rename from light9/web/paint/bg3.jpg
rename to web/paint/bg3.jpg
diff --git a/light9/web/paint/index.html b/web/paint/index.html
rename from light9/web/paint/index.html
rename to web/paint/index.html
diff --git a/light9/web/paint/paint-elements.coffee b/web/paint/paint-elements.coffee
rename from light9/web/paint/paint-elements.coffee
rename to web/paint/paint-elements.coffee
diff --git a/light9/web/paint/paint-elements.html b/web/paint/paint-elements.html
rename from light9/web/paint/paint-elements.html
rename to web/paint/paint-elements.html
diff --git a/light9/web/paint/paint-report-elements.html b/web/paint/paint-report-elements.html
rename from light9/web/paint/paint-report-elements.html
rename to web/paint/paint-report-elements.html
diff --git a/light9/web/patch.test.ts b/web/patch.test.ts
rename from light9/web/patch.test.ts
rename to web/patch.test.ts
diff --git a/light9/web/patch.ts b/web/patch.ts
rename from light9/web/patch.ts
rename to web/patch.ts
diff --git a/light9/web/rdfdb-synced-graph_test.html b/web/rdfdb-synced-graph_test.html
rename from light9/web/rdfdb-synced-graph_test.html
rename to web/rdfdb-synced-graph_test.html
diff --git a/light9/web/rdfdbclient.ts b/web/rdfdbclient.ts
rename from light9/web/rdfdbclient.ts
rename to web/rdfdbclient.ts
diff --git a/light9/web/resource-display_test.html b/web/resource-display_test.html
rename from light9/web/resource-display_test.html
rename to web/resource-display_test.html
diff --git a/light9/web/show_specific.ts b/web/show_specific.ts
rename from light9/web/show_specific.ts
rename to web/show_specific.ts
diff --git a/light9/web/style.css b/web/style.css
rename from light9/web/style.css
rename to web/style.css
diff --git a/light9/web/timeline/Note.coffee b/web/timeline/Note.coffee
rename from light9/web/timeline/Note.coffee
rename to web/timeline/Note.coffee
diff --git a/light9/web/timeline/Project.coffee b/web/timeline/Project.coffee
rename from light9/web/timeline/Project.coffee
rename to web/timeline/Project.coffee
diff --git a/light9/web/timeline/TimeAxis.coffee b/web/timeline/TimeAxis.coffee
rename from light9/web/timeline/TimeAxis.coffee
rename to web/timeline/TimeAxis.coffee
diff --git a/light9/web/timeline/TimeZoomed.coffee b/web/timeline/TimeZoomed.coffee
rename from light9/web/timeline/TimeZoomed.coffee
rename to web/timeline/TimeZoomed.coffee
diff --git a/light9/web/timeline/TimelineEditor.coffee b/web/timeline/TimelineEditor.coffee
rename from light9/web/timeline/TimelineEditor.coffee
rename to web/timeline/TimelineEditor.coffee
diff --git a/light9/web/timeline/adjustable.ts b/web/timeline/adjustable.ts
rename from light9/web/timeline/adjustable.ts
rename to web/timeline/adjustable.ts
diff --git a/light9/web/timeline/adjusters.ts b/web/timeline/adjusters.ts
rename from light9/web/timeline/adjusters.ts
rename to web/timeline/adjusters.ts
diff --git a/light9/web/timeline/brick_layout.ts b/web/timeline/brick_layout.ts
rename from light9/web/timeline/brick_layout.ts
rename to web/timeline/brick_layout.ts
diff --git a/light9/web/timeline/index.html b/web/timeline/index.html
rename from light9/web/timeline/index.html
rename to web/timeline/index.html
diff --git a/light9/web/timeline/inline-attrs.coffee b/web/timeline/inline-attrs.coffee
rename from light9/web/timeline/inline-attrs.coffee
rename to web/timeline/inline-attrs.coffee
diff --git a/light9/web/timeline/inline-attrs.html b/web/timeline/inline-attrs.html
rename from light9/web/timeline/inline-attrs.html
rename to web/timeline/inline-attrs.html
diff --git a/light9/web/timeline/timeline-elements.ts b/web/timeline/timeline-elements.ts
rename from light9/web/timeline/timeline-elements.ts
rename to web/timeline/timeline-elements.ts
diff --git a/light9/web/timeline/viewstate.ts b/web/timeline/viewstate.ts
rename from light9/web/timeline/viewstate.ts
rename to web/timeline/viewstate.ts
diff --git a/light9/web/timeline/vite.config.ts b/web/timeline/vite.config.ts
rename from light9/web/timeline/vite.config.ts
rename to web/timeline/vite.config.ts
diff --git a/light9/web/timeline2/index.html b/web/timeline2/index.html
rename from light9/web/timeline2/index.html
rename to web/timeline2/index.html
diff --git a/light9/web/timeline2/package.json b/web/timeline2/package.json
rename from light9/web/timeline2/package.json
rename to web/timeline2/package.json
diff --git a/light9/web/vite.config.ts b/web/vite.config.ts
rename from light9/web/vite.config.ts
rename to web/vite.config.ts
--- a/light9/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -2,8 +2,8 @@ import { defineConfig } from "vite";
 
 export default defineConfig({
   base: "/",
-  root: "./light9/web",
-  publicDir: "../../node_modules",
+  root: "./web",
+  publicDir: "../node_modules",
   server: {
     host: "0.0.0.0",
     strictPort: true,
diff --git a/light9/web/websocket.js b/web/websocket.js
rename from light9/web/websocket.js
rename to web/websocket.js