diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7c9c1bf4..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*~
-bin/
-*.out
-.idea/
-test/
-temp.sql
diff --git a/cmd/main-server.go b/wavesrv/cmd/main-server.go
similarity index 100%
rename from cmd/main-server.go
rename to wavesrv/cmd/main-server.go
diff --git a/db/db.go b/wavesrv/db/db.go
similarity index 100%
rename from db/db.go
rename to wavesrv/db/db.go
diff --git a/db/migrations/000001_init.down.sql b/wavesrv/db/migrations/000001_init.down.sql
similarity index 100%
rename from db/migrations/000001_init.down.sql
rename to wavesrv/db/migrations/000001_init.down.sql
diff --git a/db/migrations/000001_init.up.sql b/wavesrv/db/migrations/000001_init.up.sql
similarity index 100%
rename from db/migrations/000001_init.up.sql
rename to wavesrv/db/migrations/000001_init.up.sql
diff --git a/db/migrations/000002_activity.down.sql b/wavesrv/db/migrations/000002_activity.down.sql
similarity index 100%
rename from db/migrations/000002_activity.down.sql
rename to wavesrv/db/migrations/000002_activity.down.sql
diff --git a/db/migrations/000002_activity.up.sql b/wavesrv/db/migrations/000002_activity.up.sql
similarity index 100%
rename from db/migrations/000002_activity.up.sql
rename to wavesrv/db/migrations/000002_activity.up.sql
diff --git a/db/migrations/000003_renderer.down.sql b/wavesrv/db/migrations/000003_renderer.down.sql
similarity index 100%
rename from db/migrations/000003_renderer.down.sql
rename to wavesrv/db/migrations/000003_renderer.down.sql
diff --git a/db/migrations/000003_renderer.up.sql b/wavesrv/db/migrations/000003_renderer.up.sql
similarity index 100%
rename from db/migrations/000003_renderer.up.sql
rename to wavesrv/db/migrations/000003_renderer.up.sql
diff --git a/db/migrations/000004_bookmarks.down.sql b/wavesrv/db/migrations/000004_bookmarks.down.sql
similarity index 100%
rename from db/migrations/000004_bookmarks.down.sql
rename to wavesrv/db/migrations/000004_bookmarks.down.sql
diff --git a/db/migrations/000004_bookmarks.up.sql b/wavesrv/db/migrations/000004_bookmarks.up.sql
similarity index 100%
rename from db/migrations/000004_bookmarks.up.sql
rename to wavesrv/db/migrations/000004_bookmarks.up.sql
diff --git a/db/migrations/000005_buildtime.down.sql b/wavesrv/db/migrations/000005_buildtime.down.sql
similarity index 100%
rename from db/migrations/000005_buildtime.down.sql
rename to wavesrv/db/migrations/000005_buildtime.down.sql
diff --git a/db/migrations/000005_buildtime.up.sql b/wavesrv/db/migrations/000005_buildtime.up.sql
similarity index 100%
rename from db/migrations/000005_buildtime.up.sql
rename to wavesrv/db/migrations/000005_buildtime.up.sql
diff --git a/db/migrations/000006_feopts.down.sql b/wavesrv/db/migrations/000006_feopts.down.sql
similarity index 100%
rename from db/migrations/000006_feopts.down.sql
rename to wavesrv/db/migrations/000006_feopts.down.sql
diff --git a/db/migrations/000006_feopts.up.sql b/wavesrv/db/migrations/000006_feopts.up.sql
similarity index 100%
rename from db/migrations/000006_feopts.up.sql
rename to wavesrv/db/migrations/000006_feopts.up.sql
diff --git a/db/migrations/000007_playbooks.down.sql b/wavesrv/db/migrations/000007_playbooks.down.sql
similarity index 100%
rename from db/migrations/000007_playbooks.down.sql
rename to wavesrv/db/migrations/000007_playbooks.down.sql
diff --git a/db/migrations/000007_playbooks.up.sql b/wavesrv/db/migrations/000007_playbooks.up.sql
similarity index 100%
rename from db/migrations/000007_playbooks.up.sql
rename to wavesrv/db/migrations/000007_playbooks.up.sql
diff --git a/db/migrations/000008_cloudsession.down.sql b/wavesrv/db/migrations/000008_cloudsession.down.sql
similarity index 100%
rename from db/migrations/000008_cloudsession.down.sql
rename to wavesrv/db/migrations/000008_cloudsession.down.sql
diff --git a/db/migrations/000008_cloudsession.up.sql b/wavesrv/db/migrations/000008_cloudsession.up.sql
similarity index 100%
rename from db/migrations/000008_cloudsession.up.sql
rename to wavesrv/db/migrations/000008_cloudsession.up.sql
diff --git a/db/migrations/000009_screenprimary.down.sql b/wavesrv/db/migrations/000009_screenprimary.down.sql
similarity index 100%
rename from db/migrations/000009_screenprimary.down.sql
rename to wavesrv/db/migrations/000009_screenprimary.down.sql
diff --git a/db/migrations/000009_screenprimary.up.sql b/wavesrv/db/migrations/000009_screenprimary.up.sql
similarity index 100%
rename from db/migrations/000009_screenprimary.up.sql
rename to wavesrv/db/migrations/000009_screenprimary.up.sql
diff --git a/db/migrations/000010_removewindowid.down.sql b/wavesrv/db/migrations/000010_removewindowid.down.sql
similarity index 100%
rename from db/migrations/000010_removewindowid.down.sql
rename to wavesrv/db/migrations/000010_removewindowid.down.sql
diff --git a/db/migrations/000010_removewindowid.up.sql b/wavesrv/db/migrations/000010_removewindowid.up.sql
similarity index 100%
rename from db/migrations/000010_removewindowid.up.sql
rename to wavesrv/db/migrations/000010_removewindowid.up.sql
diff --git a/db/migrations/000011_cmdscreenid.down.sql b/wavesrv/db/migrations/000011_cmdscreenid.down.sql
similarity index 100%
rename from db/migrations/000011_cmdscreenid.down.sql
rename to wavesrv/db/migrations/000011_cmdscreenid.down.sql
diff --git a/db/migrations/000011_cmdscreenid.up.sql b/wavesrv/db/migrations/000011_cmdscreenid.up.sql
similarity index 100%
rename from db/migrations/000011_cmdscreenid.up.sql
rename to wavesrv/db/migrations/000011_cmdscreenid.up.sql
diff --git a/db/migrations/000012_historylinenum.down.sql b/wavesrv/db/migrations/000012_historylinenum.down.sql
similarity index 100%
rename from db/migrations/000012_historylinenum.down.sql
rename to wavesrv/db/migrations/000012_historylinenum.down.sql
diff --git a/db/migrations/000012_historylinenum.up.sql b/wavesrv/db/migrations/000012_historylinenum.up.sql
similarity index 100%
rename from db/migrations/000012_historylinenum.up.sql
rename to wavesrv/db/migrations/000012_historylinenum.up.sql
diff --git a/db/migrations/000013_cmdmigration.down.sql b/wavesrv/db/migrations/000013_cmdmigration.down.sql
similarity index 100%
rename from db/migrations/000013_cmdmigration.down.sql
rename to wavesrv/db/migrations/000013_cmdmigration.down.sql
diff --git a/db/migrations/000013_cmdmigration.up.sql b/wavesrv/db/migrations/000013_cmdmigration.up.sql
similarity index 100%
rename from db/migrations/000013_cmdmigration.up.sql
rename to wavesrv/db/migrations/000013_cmdmigration.up.sql
diff --git a/db/migrations/000014_simplifybookmarks.down.sql b/wavesrv/db/migrations/000014_simplifybookmarks.down.sql
similarity index 100%
rename from db/migrations/000014_simplifybookmarks.down.sql
rename to wavesrv/db/migrations/000014_simplifybookmarks.down.sql
diff --git a/db/migrations/000014_simplifybookmarks.up.sql b/wavesrv/db/migrations/000014_simplifybookmarks.up.sql
similarity index 100%
rename from db/migrations/000014_simplifybookmarks.up.sql
rename to wavesrv/db/migrations/000014_simplifybookmarks.up.sql
diff --git a/db/migrations/000015_lineupdates.down.sql b/wavesrv/db/migrations/000015_lineupdates.down.sql
similarity index 100%
rename from db/migrations/000015_lineupdates.down.sql
rename to wavesrv/db/migrations/000015_lineupdates.down.sql
diff --git a/db/migrations/000015_lineupdates.up.sql b/wavesrv/db/migrations/000015_lineupdates.up.sql
similarity index 100%
rename from db/migrations/000015_lineupdates.up.sql
rename to wavesrv/db/migrations/000015_lineupdates.up.sql
diff --git a/db/migrations/000016_webptypos.down.sql b/wavesrv/db/migrations/000016_webptypos.down.sql
similarity index 100%
rename from db/migrations/000016_webptypos.down.sql
rename to wavesrv/db/migrations/000016_webptypos.down.sql
diff --git a/db/migrations/000016_webptypos.up.sql b/wavesrv/db/migrations/000016_webptypos.up.sql
similarity index 100%
rename from db/migrations/000016_webptypos.up.sql
rename to wavesrv/db/migrations/000016_webptypos.up.sql
diff --git a/db/migrations/000017_remotevars.down.sql b/wavesrv/db/migrations/000017_remotevars.down.sql
similarity index 100%
rename from db/migrations/000017_remotevars.down.sql
rename to wavesrv/db/migrations/000017_remotevars.down.sql
diff --git a/db/migrations/000017_remotevars.up.sql b/wavesrv/db/migrations/000017_remotevars.up.sql
similarity index 100%
rename from db/migrations/000017_remotevars.up.sql
rename to wavesrv/db/migrations/000017_remotevars.up.sql
diff --git a/db/migrations/000018_modremote.down.sql b/wavesrv/db/migrations/000018_modremote.down.sql
similarity index 100%
rename from db/migrations/000018_modremote.down.sql
rename to wavesrv/db/migrations/000018_modremote.down.sql
diff --git a/db/migrations/000018_modremote.up.sql b/wavesrv/db/migrations/000018_modremote.up.sql
similarity index 100%
rename from db/migrations/000018_modremote.up.sql
rename to wavesrv/db/migrations/000018_modremote.up.sql
diff --git a/db/migrations/000019_clientopenai.down.sql b/wavesrv/db/migrations/000019_clientopenai.down.sql
similarity index 100%
rename from db/migrations/000019_clientopenai.down.sql
rename to wavesrv/db/migrations/000019_clientopenai.down.sql
diff --git a/db/migrations/000019_clientopenai.up.sql b/wavesrv/db/migrations/000019_clientopenai.up.sql
similarity index 100%
rename from db/migrations/000019_clientopenai.up.sql
rename to wavesrv/db/migrations/000019_clientopenai.up.sql
diff --git a/db/migrations/000020_linecmd.down.sql b/wavesrv/db/migrations/000020_linecmd.down.sql
similarity index 100%
rename from db/migrations/000020_linecmd.down.sql
rename to wavesrv/db/migrations/000020_linecmd.down.sql
diff --git a/db/migrations/000020_linecmd.up.sql b/wavesrv/db/migrations/000020_linecmd.up.sql
similarity index 100%
rename from db/migrations/000020_linecmd.up.sql
rename to wavesrv/db/migrations/000020_linecmd.up.sql
diff --git a/db/migrations/000021_linestate.down.sql b/wavesrv/db/migrations/000021_linestate.down.sql
similarity index 100%
rename from db/migrations/000021_linestate.down.sql
rename to wavesrv/db/migrations/000021_linestate.down.sql
diff --git a/db/migrations/000021_linestate.up.sql b/wavesrv/db/migrations/000021_linestate.up.sql
similarity index 100%
rename from db/migrations/000021_linestate.up.sql
rename to wavesrv/db/migrations/000021_linestate.up.sql
diff --git a/db/migrations/000022_endwebshare.down.sql b/wavesrv/db/migrations/000022_endwebshare.down.sql
similarity index 100%
rename from db/migrations/000022_endwebshare.down.sql
rename to wavesrv/db/migrations/000022_endwebshare.down.sql
diff --git a/db/migrations/000022_endwebshare.up.sql b/wavesrv/db/migrations/000022_endwebshare.up.sql
similarity index 100%
rename from db/migrations/000022_endwebshare.up.sql
rename to wavesrv/db/migrations/000022_endwebshare.up.sql
diff --git a/db/schema.sql b/wavesrv/db/schema.sql
similarity index 100%
rename from db/schema.sql
rename to wavesrv/db/schema.sql
diff --git a/go.mod b/wavesrv/go.mod
similarity index 100%
rename from go.mod
rename to wavesrv/go.mod
diff --git a/go.sum b/wavesrv/go.sum
similarity index 100%
rename from go.sum
rename to wavesrv/go.sum
diff --git a/pkg/cmdrunner/cmdrunner.go b/wavesrv/pkg/cmdrunner/cmdrunner.go
similarity index 100%
rename from pkg/cmdrunner/cmdrunner.go
rename to wavesrv/pkg/cmdrunner/cmdrunner.go
diff --git a/pkg/cmdrunner/linux-decls.txt b/wavesrv/pkg/cmdrunner/linux-decls.txt
similarity index 100%
rename from pkg/cmdrunner/linux-decls.txt
rename to wavesrv/pkg/cmdrunner/linux-decls.txt
diff --git a/pkg/cmdrunner/resolver.go b/wavesrv/pkg/cmdrunner/resolver.go
similarity index 100%
rename from pkg/cmdrunner/resolver.go
rename to wavesrv/pkg/cmdrunner/resolver.go
diff --git a/pkg/cmdrunner/shparse.go b/wavesrv/pkg/cmdrunner/shparse.go
similarity index 100%
rename from pkg/cmdrunner/shparse.go
rename to wavesrv/pkg/cmdrunner/shparse.go
diff --git a/pkg/cmdrunner/shparse_test.go b/wavesrv/pkg/cmdrunner/shparse_test.go
similarity index 100%
rename from pkg/cmdrunner/shparse_test.go
rename to wavesrv/pkg/cmdrunner/shparse_test.go
diff --git a/pkg/cmdrunner/termopts.go b/wavesrv/pkg/cmdrunner/termopts.go
similarity index 100%
rename from pkg/cmdrunner/termopts.go
rename to wavesrv/pkg/cmdrunner/termopts.go
diff --git a/pkg/comp/comp.go b/wavesrv/pkg/comp/comp.go
similarity index 100%
rename from pkg/comp/comp.go
rename to wavesrv/pkg/comp/comp.go
diff --git a/pkg/comp/comp_test.go b/wavesrv/pkg/comp/comp_test.go
similarity index 100%
rename from pkg/comp/comp_test.go
rename to wavesrv/pkg/comp/comp_test.go
diff --git a/pkg/comp/simplecomp.go b/wavesrv/pkg/comp/simplecomp.go
similarity index 100%
rename from pkg/comp/simplecomp.go
rename to wavesrv/pkg/comp/simplecomp.go
diff --git a/pkg/dbutil/dbutil.go b/wavesrv/pkg/dbutil/dbutil.go
similarity index 100%
rename from pkg/dbutil/dbutil.go
rename to wavesrv/pkg/dbutil/dbutil.go
diff --git a/pkg/dbutil/map.go b/wavesrv/pkg/dbutil/map.go
similarity index 100%
rename from pkg/dbutil/map.go
rename to wavesrv/pkg/dbutil/map.go
diff --git a/pkg/keygen/keygen.go b/wavesrv/pkg/keygen/keygen.go
similarity index 100%
rename from pkg/keygen/keygen.go
rename to wavesrv/pkg/keygen/keygen.go
diff --git a/pkg/mapqueue/mapqueue.go b/wavesrv/pkg/mapqueue/mapqueue.go
similarity index 100%
rename from pkg/mapqueue/mapqueue.go
rename to wavesrv/pkg/mapqueue/mapqueue.go
diff --git a/pkg/pcloud/pcloud.go b/wavesrv/pkg/pcloud/pcloud.go
similarity index 100%
rename from pkg/pcloud/pcloud.go
rename to wavesrv/pkg/pcloud/pcloud.go
diff --git a/pkg/pcloud/pclouddata.go b/wavesrv/pkg/pcloud/pclouddata.go
similarity index 100%
rename from pkg/pcloud/pclouddata.go
rename to wavesrv/pkg/pcloud/pclouddata.go
diff --git a/pkg/promptenc/promptenc.go b/wavesrv/pkg/promptenc/promptenc.go
similarity index 100%
rename from pkg/promptenc/promptenc.go
rename to wavesrv/pkg/promptenc/promptenc.go
diff --git a/pkg/remote/circlelog.go b/wavesrv/pkg/remote/circlelog.go
similarity index 100%
rename from pkg/remote/circlelog.go
rename to wavesrv/pkg/remote/circlelog.go
diff --git a/pkg/remote/openai/openai.go b/wavesrv/pkg/remote/openai/openai.go
similarity index 100%
rename from pkg/remote/openai/openai.go
rename to wavesrv/pkg/remote/openai/openai.go
diff --git a/pkg/remote/remote.go b/wavesrv/pkg/remote/remote.go
similarity index 100%
rename from pkg/remote/remote.go
rename to wavesrv/pkg/remote/remote.go
diff --git a/pkg/remote/updatequeue.go b/wavesrv/pkg/remote/updatequeue.go
similarity index 100%
rename from pkg/remote/updatequeue.go
rename to wavesrv/pkg/remote/updatequeue.go
diff --git a/pkg/rtnstate/rtnstate.go b/wavesrv/pkg/rtnstate/rtnstate.go
similarity index 100%
rename from pkg/rtnstate/rtnstate.go
rename to wavesrv/pkg/rtnstate/rtnstate.go
diff --git a/pkg/scbase/scbase.go b/wavesrv/pkg/scbase/scbase.go
similarity index 100%
rename from pkg/scbase/scbase.go
rename to wavesrv/pkg/scbase/scbase.go
diff --git a/pkg/scpacket/scpacket.go b/wavesrv/pkg/scpacket/scpacket.go
similarity index 100%
rename from pkg/scpacket/scpacket.go
rename to wavesrv/pkg/scpacket/scpacket.go
diff --git a/pkg/scws/scws.go b/wavesrv/pkg/scws/scws.go
similarity index 100%
rename from pkg/scws/scws.go
rename to wavesrv/pkg/scws/scws.go
diff --git a/pkg/shparse/comp.go b/wavesrv/pkg/shparse/comp.go
similarity index 100%
rename from pkg/shparse/comp.go
rename to wavesrv/pkg/shparse/comp.go
diff --git a/pkg/shparse/expand.go b/wavesrv/pkg/shparse/expand.go
similarity index 100%
rename from pkg/shparse/expand.go
rename to wavesrv/pkg/shparse/expand.go
diff --git a/pkg/shparse/extend.go b/wavesrv/pkg/shparse/extend.go
similarity index 100%
rename from pkg/shparse/extend.go
rename to wavesrv/pkg/shparse/extend.go
diff --git a/pkg/shparse/shparse.go b/wavesrv/pkg/shparse/shparse.go
similarity index 100%
rename from pkg/shparse/shparse.go
rename to wavesrv/pkg/shparse/shparse.go
diff --git a/pkg/shparse/shparse_test.go b/wavesrv/pkg/shparse/shparse_test.go
similarity index 100%
rename from pkg/shparse/shparse_test.go
rename to wavesrv/pkg/shparse/shparse_test.go
diff --git a/pkg/shparse/tokenize.go b/wavesrv/pkg/shparse/tokenize.go
similarity index 100%
rename from pkg/shparse/tokenize.go
rename to wavesrv/pkg/shparse/tokenize.go
diff --git a/pkg/sstore/dbops.go b/wavesrv/pkg/sstore/dbops.go
similarity index 100%
rename from pkg/sstore/dbops.go
rename to wavesrv/pkg/sstore/dbops.go
diff --git a/pkg/sstore/fileops.go b/wavesrv/pkg/sstore/fileops.go
similarity index 100%
rename from pkg/sstore/fileops.go
rename to wavesrv/pkg/sstore/fileops.go
diff --git a/pkg/sstore/map.go b/wavesrv/pkg/sstore/map.go
similarity index 100%
rename from pkg/sstore/map.go
rename to wavesrv/pkg/sstore/map.go
diff --git a/pkg/sstore/migrate.go b/wavesrv/pkg/sstore/migrate.go
similarity index 100%
rename from pkg/sstore/migrate.go
rename to wavesrv/pkg/sstore/migrate.go
diff --git a/pkg/sstore/quick.go b/wavesrv/pkg/sstore/quick.go
similarity index 100%
rename from pkg/sstore/quick.go
rename to wavesrv/pkg/sstore/quick.go
diff --git a/pkg/sstore/sstore.go b/wavesrv/pkg/sstore/sstore.go
similarity index 100%
rename from pkg/sstore/sstore.go
rename to wavesrv/pkg/sstore/sstore.go
diff --git a/pkg/sstore/sstore_migrate.go b/wavesrv/pkg/sstore/sstore_migrate.go
similarity index 100%
rename from pkg/sstore/sstore_migrate.go
rename to wavesrv/pkg/sstore/sstore_migrate.go
diff --git a/pkg/sstore/updatebus.go b/wavesrv/pkg/sstore/updatebus.go
similarity index 100%
rename from pkg/sstore/updatebus.go
rename to wavesrv/pkg/sstore/updatebus.go
diff --git a/pkg/utilfn/linediff.go b/wavesrv/pkg/utilfn/linediff.go
similarity index 100%
rename from pkg/utilfn/linediff.go
rename to wavesrv/pkg/utilfn/linediff.go
diff --git a/pkg/utilfn/utilfn.go b/wavesrv/pkg/utilfn/utilfn.go
similarity index 100%
rename from pkg/utilfn/utilfn.go
rename to wavesrv/pkg/utilfn/utilfn.go
diff --git a/pkg/utilfn/utilfn_test.go b/wavesrv/pkg/utilfn/utilfn_test.go
similarity index 100%
rename from pkg/utilfn/utilfn_test.go
rename to wavesrv/pkg/utilfn/utilfn_test.go
diff --git a/pkg/wsshell/wsshell.go b/wavesrv/pkg/wsshell/wsshell.go
similarity index 100%
rename from pkg/wsshell/wsshell.go
rename to wavesrv/pkg/wsshell/wsshell.go
diff --git a/scripthaus.md b/wavesrv/scripthaus.md
similarity index 100%
rename from scripthaus.md
rename to wavesrv/scripthaus.md