diff --git a/pyulib/.project b/lib/pyulib/.project
similarity index 100%
rename from pyulib/.project
rename to lib/pyulib/.project
diff --git a/pyulib/.pydevproject b/lib/pyulib/.pydevproject
similarity index 100%
rename from pyulib/.pydevproject
rename to lib/pyulib/.pydevproject
diff --git a/pyulib/.settings/org.eclipse.core.resources.prefs b/lib/pyulib/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from pyulib/.settings/org.eclipse.core.resources.prefs
rename to lib/pyulib/.settings/org.eclipse.core.resources.prefs
diff --git a/pyulib/.settings/org.eclipse.core.runtime.prefs b/lib/pyulib/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from pyulib/.settings/org.eclipse.core.runtime.prefs
rename to lib/pyulib/.settings/org.eclipse.core.runtime.prefs
diff --git a/pyulib/.udir b/lib/pyulib/.udir
similarity index 100%
rename from pyulib/.udir
rename to lib/pyulib/.udir
diff --git a/pyulib/MANIFEST.in b/lib/pyulib/MANIFEST.in
similarity index 100%
rename from pyulib/MANIFEST.in
rename to lib/pyulib/MANIFEST.in
diff --git a/pyulib/devel/TODO.txt b/lib/pyulib/devel/TODO.txt
similarity index 100%
rename from pyulib/devel/TODO.txt
rename to lib/pyulib/devel/TODO.txt
diff --git a/pyulib/devel/Tasks.txt b/lib/pyulib/devel/Tasks.txt
similarity index 100%
rename from pyulib/devel/Tasks.txt
rename to lib/pyulib/devel/Tasks.txt
diff --git a/pyulib/devel/doctests b/lib/pyulib/devel/doctests
similarity index 100%
rename from pyulib/devel/doctests
rename to lib/pyulib/devel/doctests
diff --git a/pyulib/devel/idleshell b/lib/pyulib/devel/idleshell
similarity index 100%
rename from pyulib/devel/idleshell
rename to lib/pyulib/devel/idleshell
diff --git a/pyulib/devel/mkdiff-webpy.sh b/lib/pyulib/devel/mkdiff-webpy.sh
similarity index 100%
rename from pyulib/devel/mkdiff-webpy.sh
rename to lib/pyulib/devel/mkdiff-webpy.sh
diff --git a/pyulib/devel/pt b/lib/pyulib/devel/pt
similarity index 100%
rename from pyulib/devel/pt
rename to lib/pyulib/devel/pt
diff --git a/pyulib/devel/pyshell b/lib/pyulib/devel/pyshell
similarity index 100%
rename from pyulib/devel/pyshell
rename to lib/pyulib/devel/pyshell
diff --git a/pyulib/devel/python_interpreters b/lib/pyulib/devel/python_interpreters
similarity index 100%
rename from pyulib/devel/python_interpreters
rename to lib/pyulib/devel/python_interpreters
diff --git a/pyulib/devel/shell_init b/lib/pyulib/devel/shell_init
similarity index 100%
rename from pyulib/devel/shell_init
rename to lib/pyulib/devel/shell_init
diff --git a/pyulib/devel/spp b/lib/pyulib/devel/spp
similarity index 100%
rename from pyulib/devel/spp
rename to lib/pyulib/devel/spp
diff --git a/pyulib/devel/web.py-0.33.patch b/lib/pyulib/devel/web.py-0.33.patch
similarity index 100%
rename from pyulib/devel/web.py-0.33.patch
rename to lib/pyulib/devel/web.py-0.33.patch
diff --git a/pyulib/migrate/base.py b/lib/pyulib/migrate/base.py
similarity index 100%
rename from pyulib/migrate/base.py
rename to lib/pyulib/migrate/base.py
diff --git a/pyulib/migrate/tasks1/TODO.py b/lib/pyulib/migrate/tasks1/TODO.py
similarity index 100%
rename from pyulib/migrate/tasks1/TODO.py
rename to lib/pyulib/migrate/tasks1/TODO.py
diff --git a/pyulib/migrate/tasks1/TODO_helper.py b/lib/pyulib/migrate/tasks1/TODO_helper.py
similarity index 100%
rename from pyulib/migrate/tasks1/TODO_helper.py
rename to lib/pyulib/migrate/tasks1/TODO_helper.py
diff --git a/pyulib/migrate/tasks1/tiddlywiki.py b/lib/pyulib/migrate/tasks1/tiddlywiki.py
similarity index 100%
rename from pyulib/migrate/tasks1/tiddlywiki.py
rename to lib/pyulib/migrate/tasks1/tiddlywiki.py
diff --git a/pyulib/migrate/tasks1/tiddlywiki2.py b/lib/pyulib/migrate/tasks1/tiddlywiki2.py
similarity index 100%
rename from pyulib/migrate/tasks1/tiddlywiki2.py
rename to lib/pyulib/migrate/tasks1/tiddlywiki2.py
diff --git a/pyulib/migrate/tasks2/Tasks.py b/lib/pyulib/migrate/tasks2/Tasks.py
similarity index 100%
rename from pyulib/migrate/tasks2/Tasks.py
rename to lib/pyulib/migrate/tasks2/Tasks.py
diff --git a/pyulib/migrate/tasks2/TiddlyWiki.py b/lib/pyulib/migrate/tasks2/TiddlyWiki.py
similarity index 100%
rename from pyulib/migrate/tasks2/TiddlyWiki.py
rename to lib/pyulib/migrate/tasks2/TiddlyWiki.py
diff --git a/pyulib/migrate/wo.py b/lib/pyulib/migrate/wo.py
similarity index 100%
rename from pyulib/migrate/wo.py
rename to lib/pyulib/migrate/wo.py
diff --git a/pyulib/setup.py b/lib/pyulib/setup.py
similarity index 100%
rename from pyulib/setup.py
rename to lib/pyulib/setup.py
diff --git a/pyulib/src/ULIB_CONFIG.py b/lib/pyulib/src/ULIB_CONFIG.py
similarity index 100%
rename from pyulib/src/ULIB_CONFIG.py
rename to lib/pyulib/src/ULIB_CONFIG.py
diff --git a/pyulib/src/i_need_py23.py b/lib/pyulib/src/i_need_py23.py
similarity index 100%
rename from pyulib/src/i_need_py23.py
rename to lib/pyulib/src/i_need_py23.py
diff --git a/pyulib/src/i_need_py24.py b/lib/pyulib/src/i_need_py24.py
similarity index 100%
rename from pyulib/src/i_need_py24.py
rename to lib/pyulib/src/i_need_py24.py
diff --git a/pyulib/src/i_need_py25.py b/lib/pyulib/src/i_need_py25.py
similarity index 100%
rename from pyulib/src/i_need_py25.py
rename to lib/pyulib/src/i_need_py25.py
diff --git a/pyulib/src/i_need_py26.py b/lib/pyulib/src/i_need_py26.py
similarity index 100%
rename from pyulib/src/i_need_py26.py
rename to lib/pyulib/src/i_need_py26.py
diff --git a/pyulib/src/i_need_py27.py b/lib/pyulib/src/i_need_py27.py
similarity index 100%
rename from pyulib/src/i_need_py27.py
rename to lib/pyulib/src/i_need_py27.py
diff --git a/pyulib/src/uapps/__init__.py b/lib/pyulib/src/uapps/__init__.py
similarity index 100%
rename from pyulib/src/uapps/__init__.py
rename to lib/pyulib/src/uapps/__init__.py
diff --git a/pyulib/src/uapps/jclain_license.txt b/lib/pyulib/src/uapps/jclain_license.txt
similarity index 100%
rename from pyulib/src/uapps/jclain_license.txt
rename to lib/pyulib/src/uapps/jclain_license.txt
diff --git a/pyulib/src/uapps/plbck.py b/lib/pyulib/src/uapps/plbck.py
similarity index 100%
rename from pyulib/src/uapps/plbck.py
rename to lib/pyulib/src/uapps/plbck.py
diff --git a/pyulib/src/uapps/plver.py b/lib/pyulib/src/uapps/plver.py
similarity index 100%
rename from pyulib/src/uapps/plver.py
rename to lib/pyulib/src/uapps/plver.py
diff --git a/pyulib/src/uapps/pyucontacts.py b/lib/pyulib/src/uapps/pyucontacts.py
similarity index 100%
rename from pyulib/src/uapps/pyucontacts.py
rename to lib/pyulib/src/uapps/pyucontacts.py
diff --git a/pyulib/src/uapps/pyurelease.py b/lib/pyulib/src/uapps/pyurelease.py
similarity index 100%
rename from pyulib/src/uapps/pyurelease.py
rename to lib/pyulib/src/uapps/pyurelease.py
diff --git a/pyulib/src/uapps/pyutasks.py b/lib/pyulib/src/uapps/pyutasks.py
similarity index 100%
rename from pyulib/src/uapps/pyutasks.py
rename to lib/pyulib/src/uapps/pyutasks.py
diff --git a/pyulib/src/uapps/pyuupdate_inc.py b/lib/pyulib/src/uapps/pyuupdate_inc.py
similarity index 100%
rename from pyulib/src/uapps/pyuupdate_inc.py
rename to lib/pyulib/src/uapps/pyuupdate_inc.py
diff --git a/pyulib/src/uapps/tasks/__init__.py b/lib/pyulib/src/uapps/tasks/__init__.py
similarity index 100%
rename from pyulib/src/uapps/tasks/__init__.py
rename to lib/pyulib/src/uapps/tasks/__init__.py
diff --git a/pyulib/src/uapps/tasks/httpd/__init__.py b/lib/pyulib/src/uapps/tasks/httpd/__init__.py
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/__init__.py
rename to lib/pyulib/src/uapps/tasks/httpd/__init__.py
diff --git a/pyulib/src/uapps/tasks/httpd/server.py b/lib/pyulib/src/uapps/tasks/httpd/server.py
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/server.py
rename to lib/pyulib/src/uapps/tasks/httpd/server.py
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/ie.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/ie.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/ie.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/ie.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/cross.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/cross.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/cross.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/cross.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/key.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/key.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/key.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/key.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/tick.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/tick.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/tick.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/icons/tick.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/readme.txt b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/readme.txt
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/readme.txt
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/readme.txt
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/screen.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/screen.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/screen.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/buttons/screen.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/readme.txt b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/readme.txt
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/readme.txt
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/readme.txt
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/screen.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/screen.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/screen.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/fancy-type/screen.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/doc.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/doc.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/doc.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/doc.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/email.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/email.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/email.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/email.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/external.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/external.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/external.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/external.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/feed.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/feed.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/feed.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/feed.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/im.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/im.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/im.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/im.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/pdf.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/pdf.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/pdf.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/pdf.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/visited.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/visited.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/visited.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/visited.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/xls.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/xls.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/xls.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/icons/xls.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/readme.txt b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/readme.txt
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/readme.txt
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/readme.txt
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/screen.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/screen.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/screen.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/link-icons/screen.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/readme.txt b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/readme.txt
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/readme.txt
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/readme.txt
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/screen.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/screen.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/screen.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/rtl/screen.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/AUTHORS.textile b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/AUTHORS.textile
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/AUTHORS.textile
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/AUTHORS.textile
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/README.textile b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/README.textile
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/README.textile
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/README.textile
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/screen.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/screen.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/screen.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/plugins/tabs/screen.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/print.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/print.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/print.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/print.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/screen.css b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/screen.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/screen.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/screen.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/blueprint/src/grid.png b/lib/pyulib/src/uapps/tasks/httpd/static/blueprint/src/grid.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/blueprint/src/grid.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/blueprint/src/grid.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/bpsuppl.css b/lib/pyulib/src/uapps/tasks/httpd/static/bpsuppl.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/bpsuppl.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/bpsuppl.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock-samples.html b/lib/pyulib/src/uapps/tasks/httpd/static/clock-samples.html
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock-samples.html
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock-samples.html
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock.css b/lib/pyulib/src/uapps/tasks/httpd/static/clock.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/add.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/add.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/add.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/add.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/base.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/base.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/base.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/base.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/delete.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/delete.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/delete.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/delete.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/edit.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/edit.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/edit.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/edit.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/error.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/error.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/error.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/error.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/go.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/go.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/go.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/go.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/link.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/link.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/link.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/link.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/pause.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/pause.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/pause.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/pause.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/play.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/play.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/play.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/play.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/red.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/red.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/red.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/red.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/start.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/start.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/start.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/start.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/clock/stop.png b/lib/pyulib/src/uapps/tasks/httpd/static/clock/stop.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/clock/stop.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/clock/stop.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/edit.css b/lib/pyulib/src/uapps/tasks/httpd/static/edit.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/edit.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/edit.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/favicon.ico b/lib/pyulib/src/uapps/tasks/httpd/static/favicon.ico
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/favicon.ico
rename to lib/pyulib/src/uapps/tasks/httpd/static/favicon.ico
diff --git a/pyulib/src/uapps/tasks/httpd/static/index.css b/lib/pyulib/src/uapps/tasks/httpd/static/index.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/index.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/index.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/index.js b/lib/pyulib/src/uapps/tasks/httpd/static/index.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/index.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/index.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/index.min.js b/lib/pyulib/src/uapps/tasks/httpd/static/index.min.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/index.min.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/index.min.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.js b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.min.js b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.min.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.min.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.hoverIntent.min.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.js b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.min.js b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.min.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.min.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.min.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.css b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.js b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.min.js b/lib/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.min.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.min.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/jquery.tooltip.min.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/taskshttpd.js b/lib/pyulib/src/uapps/tasks/httpd/static/taskshttpd.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/taskshttpd.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/taskshttpd.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/taskshttpd.min.js b/lib/pyulib/src/uapps/tasks/httpd/static/taskshttpd.min.js
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/taskshttpd.min.js
rename to lib/pyulib/src/uapps/tasks/httpd/static/taskshttpd.min.js
diff --git a/pyulib/src/uapps/tasks/httpd/static/zoom-samples.html b/lib/pyulib/src/uapps/tasks/httpd/static/zoom-samples.html
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/zoom-samples.html
rename to lib/pyulib/src/uapps/tasks/httpd/static/zoom-samples.html
diff --git a/pyulib/src/uapps/tasks/httpd/static/zoom.css b/lib/pyulib/src/uapps/tasks/httpd/static/zoom.css
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/zoom.css
rename to lib/pyulib/src/uapps/tasks/httpd/static/zoom.css
diff --git a/pyulib/src/uapps/tasks/httpd/static/zoom/base.png b/lib/pyulib/src/uapps/tasks/httpd/static/zoom/base.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/zoom/base.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/zoom/base.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/zoom/in.png b/lib/pyulib/src/uapps/tasks/httpd/static/zoom/in.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/zoom/in.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/zoom/in.png
diff --git a/pyulib/src/uapps/tasks/httpd/static/zoom/out.png b/lib/pyulib/src/uapps/tasks/httpd/static/zoom/out.png
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/static/zoom/out.png
rename to lib/pyulib/src/uapps/tasks/httpd/static/zoom/out.png
diff --git a/pyulib/src/uapps/tasks/httpd/templates/edit.html b/lib/pyulib/src/uapps/tasks/httpd/templates/edit.html
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/templates/edit.html
rename to lib/pyulib/src/uapps/tasks/httpd/templates/edit.html
diff --git a/pyulib/src/uapps/tasks/httpd/templates/index.html b/lib/pyulib/src/uapps/tasks/httpd/templates/index.html
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/templates/index.html
rename to lib/pyulib/src/uapps/tasks/httpd/templates/index.html
diff --git a/pyulib/src/uapps/tasks/httpd/templates/task.htmlc b/lib/pyulib/src/uapps/tasks/httpd/templates/task.htmlc
similarity index 100%
rename from pyulib/src/uapps/tasks/httpd/templates/task.htmlc
rename to lib/pyulib/src/uapps/tasks/httpd/templates/task.htmlc
diff --git a/pyulib/src/uapps/tasks/httpstore/__init__.py b/lib/pyulib/src/uapps/tasks/httpstore/__init__.py
similarity index 100%
rename from pyulib/src/uapps/tasks/httpstore/__init__.py
rename to lib/pyulib/src/uapps/tasks/httpstore/__init__.py
diff --git a/pyulib/src/uapps/tasks/httpstore/server.py b/lib/pyulib/src/uapps/tasks/httpstore/server.py
similarity index 100%
rename from pyulib/src/uapps/tasks/httpstore/server.py
rename to lib/pyulib/src/uapps/tasks/httpstore/server.py
diff --git a/pyulib/src/uapps/tasks/httpstore/templates/index.html b/lib/pyulib/src/uapps/tasks/httpstore/templates/index.html
similarity index 100%
rename from pyulib/src/uapps/tasks/httpstore/templates/index.html
rename to lib/pyulib/src/uapps/tasks/httpstore/templates/index.html
diff --git a/pyulib/src/uapps/tasks/itfctl.py b/lib/pyulib/src/uapps/tasks/itfctl.py
similarity index 100%
rename from pyulib/src/uapps/tasks/itfctl.py
rename to lib/pyulib/src/uapps/tasks/itfctl.py
diff --git a/pyulib/src/uapps/tasks/taskscli.py b/lib/pyulib/src/uapps/tasks/taskscli.py
similarity index 100%
rename from pyulib/src/uapps/tasks/taskscli.py
rename to lib/pyulib/src/uapps/tasks/taskscli.py
diff --git a/pyulib/src/uapps/uencdetect.py b/lib/pyulib/src/uapps/uencdetect.py
similarity index 100%
rename from pyulib/src/uapps/uencdetect.py
rename to lib/pyulib/src/uapps/uencdetect.py
diff --git a/pyulib/src/uapps/umail.py b/lib/pyulib/src/uapps/umail.py
similarity index 100%
rename from pyulib/src/uapps/umail.py
rename to lib/pyulib/src/uapps/umail.py
diff --git a/pyulib/src/uapps/uproject.py b/lib/pyulib/src/uapps/uproject.py
similarity index 100%
rename from pyulib/src/uapps/uproject.py
rename to lib/pyulib/src/uapps/uproject.py
diff --git a/pyulib/src/uapps/ur_license.txt b/lib/pyulib/src/uapps/ur_license.txt
similarity index 100%
rename from pyulib/src/uapps/ur_license.txt
rename to lib/pyulib/src/uapps/ur_license.txt
diff --git a/pyulib/src/uapps/urandomize.py b/lib/pyulib/src/uapps/urandomize.py
similarity index 100%
rename from pyulib/src/uapps/urandomize.py
rename to lib/pyulib/src/uapps/urandomize.py
diff --git a/pyulib/src/uapps/uxpath.py b/lib/pyulib/src/uapps/uxpath.py
similarity index 100%
rename from pyulib/src/uapps/uxpath.py
rename to lib/pyulib/src/uapps/uxpath.py
diff --git a/pyulib/src/uapps/wofixsql.py b/lib/pyulib/src/uapps/wofixsql.py
similarity index 100%
rename from pyulib/src/uapps/wofixsql.py
rename to lib/pyulib/src/uapps/wofixsql.py
diff --git a/pyulib/src/ulib/__init__.py b/lib/pyulib/src/ulib/__init__.py
similarity index 100%
rename from pyulib/src/ulib/__init__.py
rename to lib/pyulib/src/ulib/__init__.py
diff --git a/pyulib/src/ulib/all/__init__.py b/lib/pyulib/src/ulib/all/__init__.py
similarity index 100%
rename from pyulib/src/ulib/all/__init__.py
rename to lib/pyulib/src/ulib/all/__init__.py
diff --git a/pyulib/src/ulib/base/__init__.py b/lib/pyulib/src/ulib/base/__init__.py
similarity index 100%
rename from pyulib/src/ulib/base/__init__.py
rename to lib/pyulib/src/ulib/base/__init__.py
diff --git a/pyulib/src/ulib/base/args.py b/lib/pyulib/src/ulib/base/args.py
similarity index 100%
rename from pyulib/src/ulib/base/args.py
rename to lib/pyulib/src/ulib/base/args.py
diff --git a/pyulib/src/ulib/base/base.py b/lib/pyulib/src/ulib/base/base.py
similarity index 100%
rename from pyulib/src/ulib/base/base.py
rename to lib/pyulib/src/ulib/base/base.py
diff --git a/pyulib/src/ulib/base/config.py b/lib/pyulib/src/ulib/base/config.py
similarity index 100%
rename from pyulib/src/ulib/base/config.py
rename to lib/pyulib/src/ulib/base/config.py
diff --git a/pyulib/src/ulib/base/control.py b/lib/pyulib/src/ulib/base/control.py
similarity index 100%
rename from pyulib/src/ulib/base/control.py
rename to lib/pyulib/src/ulib/base/control.py
diff --git a/pyulib/src/ulib/base/dates.py b/lib/pyulib/src/ulib/base/dates.py
similarity index 100%
rename from pyulib/src/ulib/base/dates.py
rename to lib/pyulib/src/ulib/base/dates.py
diff --git a/pyulib/src/ulib/base/editor.py b/lib/pyulib/src/ulib/base/editor.py
similarity index 100%
rename from pyulib/src/ulib/base/editor.py
rename to lib/pyulib/src/ulib/base/editor.py
diff --git a/pyulib/src/ulib/base/encdetect.py b/lib/pyulib/src/ulib/base/encdetect.py
similarity index 100%
rename from pyulib/src/ulib/base/encdetect.py
rename to lib/pyulib/src/ulib/base/encdetect.py
diff --git a/pyulib/src/ulib/base/encoding.py b/lib/pyulib/src/ulib/base/encoding.py
similarity index 100%
rename from pyulib/src/ulib/base/encoding.py
rename to lib/pyulib/src/ulib/base/encoding.py
diff --git a/pyulib/src/ulib/base/env.py b/lib/pyulib/src/ulib/base/env.py
similarity index 100%
rename from pyulib/src/ulib/base/env.py
rename to lib/pyulib/src/ulib/base/env.py
diff --git a/pyulib/src/ulib/base/files.py b/lib/pyulib/src/ulib/base/files.py
similarity index 100%
rename from pyulib/src/ulib/base/files.py
rename to lib/pyulib/src/ulib/base/files.py
diff --git a/pyulib/src/ulib/base/flock.py b/lib/pyulib/src/ulib/base/flock.py
similarity index 100%
rename from pyulib/src/ulib/base/flock.py
rename to lib/pyulib/src/ulib/base/flock.py
diff --git a/pyulib/src/ulib/base/functions.py b/lib/pyulib/src/ulib/base/functions.py
similarity index 100%
rename from pyulib/src/ulib/base/functions.py
rename to lib/pyulib/src/ulib/base/functions.py
diff --git a/pyulib/src/ulib/base/htmlentities.py b/lib/pyulib/src/ulib/base/htmlentities.py
similarity index 100%
rename from pyulib/src/ulib/base/htmlentities.py
rename to lib/pyulib/src/ulib/base/htmlentities.py
diff --git a/pyulib/src/ulib/base/i_need_py23.py b/lib/pyulib/src/ulib/base/i_need_py23.py
similarity index 100%
rename from pyulib/src/ulib/base/i_need_py23.py
rename to lib/pyulib/src/ulib/base/i_need_py23.py
diff --git a/pyulib/src/ulib/base/i_need_py24.py b/lib/pyulib/src/ulib/base/i_need_py24.py
similarity index 100%
rename from pyulib/src/ulib/base/i_need_py24.py
rename to lib/pyulib/src/ulib/base/i_need_py24.py
diff --git a/pyulib/src/ulib/base/i_need_py25.py b/lib/pyulib/src/ulib/base/i_need_py25.py
similarity index 100%
rename from pyulib/src/ulib/base/i_need_py25.py
rename to lib/pyulib/src/ulib/base/i_need_py25.py
diff --git a/pyulib/src/ulib/base/i_need_py26.py b/lib/pyulib/src/ulib/base/i_need_py26.py
similarity index 100%
rename from pyulib/src/ulib/base/i_need_py26.py
rename to lib/pyulib/src/ulib/base/i_need_py26.py
diff --git a/pyulib/src/ulib/base/input.py b/lib/pyulib/src/ulib/base/input.py
similarity index 100%
rename from pyulib/src/ulib/base/input.py
rename to lib/pyulib/src/ulib/base/input.py
diff --git a/pyulib/src/ulib/base/lines.py b/lib/pyulib/src/ulib/base/lines.py
similarity index 100%
rename from pyulib/src/ulib/base/lines.py
rename to lib/pyulib/src/ulib/base/lines.py
diff --git a/pyulib/src/ulib/base/output.py b/lib/pyulib/src/ulib/base/output.py
similarity index 100%
rename from pyulib/src/ulib/base/output.py
rename to lib/pyulib/src/ulib/base/output.py
diff --git a/pyulib/src/ulib/base/pager.py b/lib/pyulib/src/ulib/base/pager.py
similarity index 100%
rename from pyulib/src/ulib/base/pager.py
rename to lib/pyulib/src/ulib/base/pager.py
diff --git a/pyulib/src/ulib/base/password.py b/lib/pyulib/src/ulib/base/password.py
similarity index 100%
rename from pyulib/src/ulib/base/password.py
rename to lib/pyulib/src/ulib/base/password.py
diff --git a/pyulib/src/ulib/base/paths.py b/lib/pyulib/src/ulib/base/paths.py
similarity index 100%
rename from pyulib/src/ulib/base/paths.py
rename to lib/pyulib/src/ulib/base/paths.py
diff --git a/pyulib/src/ulib/base/procs.py b/lib/pyulib/src/ulib/base/procs.py
similarity index 100%
rename from pyulib/src/ulib/base/procs.py
rename to lib/pyulib/src/ulib/base/procs.py
diff --git a/pyulib/src/ulib/base/pversion.py b/lib/pyulib/src/ulib/base/pversion.py
similarity index 100%
rename from pyulib/src/ulib/base/pversion.py
rename to lib/pyulib/src/ulib/base/pversion.py
diff --git a/pyulib/src/ulib/base/times.py b/lib/pyulib/src/ulib/base/times.py
similarity index 100%
rename from pyulib/src/ulib/base/times.py
rename to lib/pyulib/src/ulib/base/times.py
diff --git a/pyulib/src/ulib/base/tmpfiles.py b/lib/pyulib/src/ulib/base/tmpfiles.py
similarity index 100%
rename from pyulib/src/ulib/base/tmpfiles.py
rename to lib/pyulib/src/ulib/base/tmpfiles.py
diff --git a/pyulib/src/ulib/base/uio.py b/lib/pyulib/src/ulib/base/uio.py
similarity index 100%
rename from pyulib/src/ulib/base/uio.py
rename to lib/pyulib/src/ulib/base/uio.py
diff --git a/pyulib/src/ulib/base/words.py b/lib/pyulib/src/ulib/base/words.py
similarity index 100%
rename from pyulib/src/ulib/base/words.py
rename to lib/pyulib/src/ulib/base/words.py
diff --git a/pyulib/src/ulib/ext/__init__.py b/lib/pyulib/src/ulib/ext/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/__init__.py
rename to lib/pyulib/src/ulib/ext/__init__.py
diff --git a/pyulib/src/ulib/ext/optik141/README.txt b/lib/pyulib/src/ulib/ext/optik141/README.txt
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/README.txt
rename to lib/pyulib/src/ulib/ext/optik141/README.txt
diff --git a/pyulib/src/ulib/ext/optik141/__init__.py b/lib/pyulib/src/ulib/ext/optik141/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/__init__.py
rename to lib/pyulib/src/ulib/ext/optik141/__init__.py
diff --git a/pyulib/src/ulib/ext/optik141/errors.py b/lib/pyulib/src/ulib/ext/optik141/errors.py
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/errors.py
rename to lib/pyulib/src/ulib/ext/optik141/errors.py
diff --git a/pyulib/src/ulib/ext/optik141/help.py b/lib/pyulib/src/ulib/ext/optik141/help.py
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/help.py
rename to lib/pyulib/src/ulib/ext/optik141/help.py
diff --git a/pyulib/src/ulib/ext/optik141/option.py b/lib/pyulib/src/ulib/ext/optik141/option.py
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/option.py
rename to lib/pyulib/src/ulib/ext/optik141/option.py
diff --git a/pyulib/src/ulib/ext/optik141/option_parser.py b/lib/pyulib/src/ulib/ext/optik141/option_parser.py
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/option_parser.py
rename to lib/pyulib/src/ulib/ext/optik141/option_parser.py
diff --git a/pyulib/src/ulib/ext/optik141/textwrap.py b/lib/pyulib/src/ulib/ext/optik141/textwrap.py
similarity index 100%
rename from pyulib/src/ulib/ext/optik141/textwrap.py
rename to lib/pyulib/src/ulib/ext/optik141/textwrap.py
diff --git a/pyulib/src/ulib/ext/simplejson/__init__.py b/lib/pyulib/src/ulib/ext/simplejson/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/simplejson/__init__.py
rename to lib/pyulib/src/ulib/ext/simplejson/__init__.py
diff --git a/pyulib/src/ulib/ext/simplejson/_speedups.c b/lib/pyulib/src/ulib/ext/simplejson/_speedups.c
similarity index 100%
rename from pyulib/src/ulib/ext/simplejson/_speedups.c
rename to lib/pyulib/src/ulib/ext/simplejson/_speedups.c
diff --git a/pyulib/src/ulib/ext/simplejson/decoder.py b/lib/pyulib/src/ulib/ext/simplejson/decoder.py
similarity index 100%
rename from pyulib/src/ulib/ext/simplejson/decoder.py
rename to lib/pyulib/src/ulib/ext/simplejson/decoder.py
diff --git a/pyulib/src/ulib/ext/simplejson/encoder.py b/lib/pyulib/src/ulib/ext/simplejson/encoder.py
similarity index 100%
rename from pyulib/src/ulib/ext/simplejson/encoder.py
rename to lib/pyulib/src/ulib/ext/simplejson/encoder.py
diff --git a/pyulib/src/ulib/ext/simplejson/scanner.py b/lib/pyulib/src/ulib/ext/simplejson/scanner.py
similarity index 100%
rename from pyulib/src/ulib/ext/simplejson/scanner.py
rename to lib/pyulib/src/ulib/ext/simplejson/scanner.py
diff --git a/pyulib/src/ulib/ext/tarfile/README.txt b/lib/pyulib/src/ulib/ext/tarfile/README.txt
similarity index 100%
rename from pyulib/src/ulib/ext/tarfile/README.txt
rename to lib/pyulib/src/ulib/ext/tarfile/README.txt
diff --git a/pyulib/src/ulib/ext/tarfile/__init__.py b/lib/pyulib/src/ulib/ext/tarfile/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/tarfile/__init__.py
rename to lib/pyulib/src/ulib/ext/tarfile/__init__.py
diff --git a/pyulib/src/ulib/ext/tarfile/gzip22.py b/lib/pyulib/src/ulib/ext/tarfile/gzip22.py
similarity index 100%
rename from pyulib/src/ulib/ext/tarfile/gzip22.py
rename to lib/pyulib/src/ulib/ext/tarfile/gzip22.py
diff --git a/pyulib/src/ulib/ext/tarfile/tarfile.py b/lib/pyulib/src/ulib/ext/tarfile/tarfile.py
similarity index 100%
rename from pyulib/src/ulib/ext/tarfile/tarfile.py
rename to lib/pyulib/src/ulib/ext/tarfile/tarfile.py
diff --git a/pyulib/src/ulib/ext/web/__init__.py b/lib/pyulib/src/ulib/ext/web/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/__init__.py
rename to lib/pyulib/src/ulib/ext/web/__init__.py
diff --git a/pyulib/src/ulib/ext/web/application.py b/lib/pyulib/src/ulib/ext/web/application.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/application.py
rename to lib/pyulib/src/ulib/ext/web/application.py
diff --git a/pyulib/src/ulib/ext/web/browser.py b/lib/pyulib/src/ulib/ext/web/browser.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/browser.py
rename to lib/pyulib/src/ulib/ext/web/browser.py
diff --git a/pyulib/src/ulib/ext/web/contrib/__init__.py b/lib/pyulib/src/ulib/ext/web/contrib/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/contrib/__init__.py
rename to lib/pyulib/src/ulib/ext/web/contrib/__init__.py
diff --git a/pyulib/src/ulib/ext/web/contrib/template.py b/lib/pyulib/src/ulib/ext/web/contrib/template.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/contrib/template.py
rename to lib/pyulib/src/ulib/ext/web/contrib/template.py
diff --git a/pyulib/src/ulib/ext/web/db.py b/lib/pyulib/src/ulib/ext/web/db.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/db.py
rename to lib/pyulib/src/ulib/ext/web/db.py
diff --git a/pyulib/src/ulib/ext/web/debugerror.py b/lib/pyulib/src/ulib/ext/web/debugerror.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/debugerror.py
rename to lib/pyulib/src/ulib/ext/web/debugerror.py
diff --git a/pyulib/src/ulib/ext/web/form.py b/lib/pyulib/src/ulib/ext/web/form.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/form.py
rename to lib/pyulib/src/ulib/ext/web/form.py
diff --git a/pyulib/src/ulib/ext/web/http.py b/lib/pyulib/src/ulib/ext/web/http.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/http.py
rename to lib/pyulib/src/ulib/ext/web/http.py
diff --git a/pyulib/src/ulib/ext/web/httpserver.py b/lib/pyulib/src/ulib/ext/web/httpserver.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/httpserver.py
rename to lib/pyulib/src/ulib/ext/web/httpserver.py
diff --git a/pyulib/src/ulib/ext/web/net.py b/lib/pyulib/src/ulib/ext/web/net.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/net.py
rename to lib/pyulib/src/ulib/ext/web/net.py
diff --git a/pyulib/src/ulib/ext/web/session.py b/lib/pyulib/src/ulib/ext/web/session.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/session.py
rename to lib/pyulib/src/ulib/ext/web/session.py
diff --git a/pyulib/src/ulib/ext/web/template.py b/lib/pyulib/src/ulib/ext/web/template.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/template.py
rename to lib/pyulib/src/ulib/ext/web/template.py
diff --git a/pyulib/src/ulib/ext/web/test.py b/lib/pyulib/src/ulib/ext/web/test.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/test.py
rename to lib/pyulib/src/ulib/ext/web/test.py
diff --git a/pyulib/src/ulib/ext/web/utils.py b/lib/pyulib/src/ulib/ext/web/utils.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/utils.py
rename to lib/pyulib/src/ulib/ext/web/utils.py
diff --git a/pyulib/src/ulib/ext/web/webapi.py b/lib/pyulib/src/ulib/ext/web/webapi.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/webapi.py
rename to lib/pyulib/src/ulib/ext/web/webapi.py
diff --git a/pyulib/src/ulib/ext/web/webopenid.py b/lib/pyulib/src/ulib/ext/web/webopenid.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/webopenid.py
rename to lib/pyulib/src/ulib/ext/web/webopenid.py
diff --git a/pyulib/src/ulib/ext/web/wsgi.py b/lib/pyulib/src/ulib/ext/web/wsgi.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/wsgi.py
rename to lib/pyulib/src/ulib/ext/web/wsgi.py
diff --git a/pyulib/src/ulib/ext/web/wsgiserver/LICENSE.txt b/lib/pyulib/src/ulib/ext/web/wsgiserver/LICENSE.txt
similarity index 100%
rename from pyulib/src/ulib/ext/web/wsgiserver/LICENSE.txt
rename to lib/pyulib/src/ulib/ext/web/wsgiserver/LICENSE.txt
diff --git a/pyulib/src/ulib/ext/web/wsgiserver/__init__.py b/lib/pyulib/src/ulib/ext/web/wsgiserver/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/web/wsgiserver/__init__.py
rename to lib/pyulib/src/ulib/ext/web/wsgiserver/__init__.py
diff --git a/pyulib/src/ulib/ext/xpath/README.rst b/lib/pyulib/src/ulib/ext/xpath/README.rst
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/README.rst
rename to lib/pyulib/src/ulib/ext/xpath/README.rst
diff --git a/pyulib/src/ulib/ext/xpath/__init__.py b/lib/pyulib/src/ulib/ext/xpath/__init__.py
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/__init__.py
rename to lib/pyulib/src/ulib/ext/xpath/__init__.py
diff --git a/pyulib/src/ulib/ext/xpath/_xpath.py b/lib/pyulib/src/ulib/ext/xpath/_xpath.py
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/_xpath.py
rename to lib/pyulib/src/ulib/ext/xpath/_xpath.py
diff --git a/pyulib/src/ulib/ext/xpath/exceptions.py b/lib/pyulib/src/ulib/ext/xpath/exceptions.py
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/exceptions.py
rename to lib/pyulib/src/ulib/ext/xpath/exceptions.py
diff --git a/pyulib/src/ulib/ext/xpath/expr.py b/lib/pyulib/src/ulib/ext/xpath/expr.py
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/expr.py
rename to lib/pyulib/src/ulib/ext/xpath/expr.py
diff --git a/pyulib/src/ulib/ext/xpath/parser.g b/lib/pyulib/src/ulib/ext/xpath/parser.g
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/parser.g
rename to lib/pyulib/src/ulib/ext/xpath/parser.g
diff --git a/pyulib/src/ulib/ext/xpath/parser.py b/lib/pyulib/src/ulib/ext/xpath/parser.py
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/parser.py
rename to lib/pyulib/src/ulib/ext/xpath/parser.py
diff --git a/pyulib/src/ulib/ext/xpath/yappsrt.py b/lib/pyulib/src/ulib/ext/xpath/yappsrt.py
similarity index 100%
rename from pyulib/src/ulib/ext/xpath/yappsrt.py
rename to lib/pyulib/src/ulib/ext/xpath/yappsrt.py
diff --git a/pyulib/src/ulib/formats/__init__.py b/lib/pyulib/src/ulib/formats/__init__.py
similarity index 100%
rename from pyulib/src/ulib/formats/__init__.py
rename to lib/pyulib/src/ulib/formats/__init__.py
diff --git a/pyulib/src/ulib/formats/base.py b/lib/pyulib/src/ulib/formats/base.py
similarity index 100%
rename from pyulib/src/ulib/formats/base.py
rename to lib/pyulib/src/ulib/formats/base.py
diff --git a/pyulib/src/ulib/formats/boolean.py b/lib/pyulib/src/ulib/formats/boolean.py
similarity index 100%
rename from pyulib/src/ulib/formats/boolean.py
rename to lib/pyulib/src/ulib/formats/boolean.py
diff --git a/pyulib/src/ulib/formats/datetime.py b/lib/pyulib/src/ulib/formats/datetime.py
similarity index 100%
rename from pyulib/src/ulib/formats/datetime.py
rename to lib/pyulib/src/ulib/formats/datetime.py
diff --git a/pyulib/src/ulib/formats/float.py b/lib/pyulib/src/ulib/formats/float.py
similarity index 100%
rename from pyulib/src/ulib/formats/float.py
rename to lib/pyulib/src/ulib/formats/float.py
diff --git a/pyulib/src/ulib/formats/integer.py b/lib/pyulib/src/ulib/formats/integer.py
similarity index 100%
rename from pyulib/src/ulib/formats/integer.py
rename to lib/pyulib/src/ulib/formats/integer.py
diff --git a/pyulib/src/ulib/formats/jour.py b/lib/pyulib/src/ulib/formats/jour.py
similarity index 100%
rename from pyulib/src/ulib/formats/jour.py
rename to lib/pyulib/src/ulib/formats/jour.py
diff --git a/pyulib/src/ulib/formats/strings.py b/lib/pyulib/src/ulib/formats/strings.py
similarity index 100%
rename from pyulib/src/ulib/formats/strings.py
rename to lib/pyulib/src/ulib/formats/strings.py
diff --git a/pyulib/src/ulib/formats/telephone.py b/lib/pyulib/src/ulib/formats/telephone.py
similarity index 100%
rename from pyulib/src/ulib/formats/telephone.py
rename to lib/pyulib/src/ulib/formats/telephone.py
diff --git a/pyulib/src/ulib/formats/weekday.py b/lib/pyulib/src/ulib/formats/weekday.py
similarity index 100%
rename from pyulib/src/ulib/formats/weekday.py
rename to lib/pyulib/src/ulib/formats/weekday.py
diff --git a/pyulib/src/ulib/gae/__init__.py b/lib/pyulib/src/ulib/gae/__init__.py
similarity index 100%
rename from pyulib/src/ulib/gae/__init__.py
rename to lib/pyulib/src/ulib/gae/__init__.py
diff --git a/pyulib/src/ulib/gae/dao.py b/lib/pyulib/src/ulib/gae/dao.py
similarity index 100%
rename from pyulib/src/ulib/gae/dao.py
rename to lib/pyulib/src/ulib/gae/dao.py
diff --git a/pyulib/src/ulib/gae/datetime.py b/lib/pyulib/src/ulib/gae/datetime.py
similarity index 100%
rename from pyulib/src/ulib/gae/datetime.py
rename to lib/pyulib/src/ulib/gae/datetime.py
diff --git a/pyulib/src/ulib/gae/pages.py b/lib/pyulib/src/ulib/gae/pages.py
similarity index 100%
rename from pyulib/src/ulib/gae/pages.py
rename to lib/pyulib/src/ulib/gae/pages.py
diff --git a/pyulib/src/ulib/json/__init__.py b/lib/pyulib/src/ulib/json/__init__.py
similarity index 100%
rename from pyulib/src/ulib/json/__init__.py
rename to lib/pyulib/src/ulib/json/__init__.py
diff --git a/pyulib/src/ulib/optparse/__init__.py b/lib/pyulib/src/ulib/optparse/__init__.py
similarity index 100%
rename from pyulib/src/ulib/optparse/__init__.py
rename to lib/pyulib/src/ulib/optparse/__init__.py
diff --git a/pyulib/src/ulib/p/__init__.py b/lib/pyulib/src/ulib/p/__init__.py
similarity index 100%
rename from pyulib/src/ulib/p/__init__.py
rename to lib/pyulib/src/ulib/p/__init__.py
diff --git a/pyulib/src/ulib/p/dirconf.py b/lib/pyulib/src/ulib/p/dirconf.py
similarity index 100%
rename from pyulib/src/ulib/p/dirconf.py
rename to lib/pyulib/src/ulib/p/dirconf.py
diff --git a/pyulib/src/ulib/p/templ/__init__.py b/lib/pyulib/src/ulib/p/templ/__init__.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/__init__.py
rename to lib/pyulib/src/ulib/p/templ/__init__.py
diff --git a/pyulib/src/ulib/p/templ/base.py b/lib/pyulib/src/ulib/p/templ/base.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/base.py
rename to lib/pyulib/src/ulib/p/templ/base.py
diff --git a/pyulib/src/ulib/p/templ/htmltempl.py b/lib/pyulib/src/ulib/p/templ/htmltempl.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/htmltempl.py
rename to lib/pyulib/src/ulib/p/templ/htmltempl.py
diff --git a/pyulib/src/ulib/p/templ/markdowntempl.py b/lib/pyulib/src/ulib/p/templ/markdowntempl.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/markdowntempl.py
rename to lib/pyulib/src/ulib/p/templ/markdowntempl.py
diff --git a/pyulib/src/ulib/p/templ/pytempl.py b/lib/pyulib/src/ulib/p/templ/pytempl.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/pytempl.py
rename to lib/pyulib/src/ulib/p/templ/pytempl.py
diff --git a/pyulib/src/ulib/p/templ/shtempl.py b/lib/pyulib/src/ulib/p/templ/shtempl.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/shtempl.py
rename to lib/pyulib/src/ulib/p/templ/shtempl.py
diff --git a/pyulib/src/ulib/p/templ/texttempl.py b/lib/pyulib/src/ulib/p/templ/texttempl.py
similarity index 100%
rename from pyulib/src/ulib/p/templ/texttempl.py
rename to lib/pyulib/src/ulib/p/templ/texttempl.py
diff --git a/pyulib/src/ulib/p/uinc/__init__.py b/lib/pyulib/src/ulib/p/uinc/__init__.py
similarity index 100%
rename from pyulib/src/ulib/p/uinc/__init__.py
rename to lib/pyulib/src/ulib/p/uinc/__init__.py
diff --git a/pyulib/src/ulib/p/uinc/output.py b/lib/pyulib/src/ulib/p/uinc/output.py
similarity index 100%
rename from pyulib/src/ulib/p/uinc/output.py
rename to lib/pyulib/src/ulib/p/uinc/output.py
diff --git a/pyulib/src/ulib/p/uinc/spec.py b/lib/pyulib/src/ulib/p/uinc/spec.py
similarity index 100%
rename from pyulib/src/ulib/p/uinc/spec.py
rename to lib/pyulib/src/ulib/p/uinc/spec.py
diff --git a/pyulib/src/ulib/p/uinc/updater.py b/lib/pyulib/src/ulib/p/uinc/updater.py
similarity index 100%
rename from pyulib/src/ulib/p/uinc/updater.py
rename to lib/pyulib/src/ulib/p/uinc/updater.py
diff --git a/pyulib/src/ulib/p/vcs/__init__.py b/lib/pyulib/src/ulib/p/vcs/__init__.py
similarity index 100%
rename from pyulib/src/ulib/p/vcs/__init__.py
rename to lib/pyulib/src/ulib/p/vcs/__init__.py
diff --git a/pyulib/src/ulib/p/vcs/base.py b/lib/pyulib/src/ulib/p/vcs/base.py
similarity index 100%
rename from pyulib/src/ulib/p/vcs/base.py
rename to lib/pyulib/src/ulib/p/vcs/base.py
diff --git a/pyulib/src/ulib/p/vcs/cvs.py b/lib/pyulib/src/ulib/p/vcs/cvs.py
similarity index 100%
rename from pyulib/src/ulib/p/vcs/cvs.py
rename to lib/pyulib/src/ulib/p/vcs/cvs.py
diff --git a/pyulib/src/ulib/p/vcs/svn.py b/lib/pyulib/src/ulib/p/vcs/svn.py
similarity index 100%
rename from pyulib/src/ulib/p/vcs/svn.py
rename to lib/pyulib/src/ulib/p/vcs/svn.py
diff --git a/pyulib/src/ulib/p/wop/__init__.py b/lib/pyulib/src/ulib/p/wop/__init__.py
similarity index 100%
rename from pyulib/src/ulib/p/wop/__init__.py
rename to lib/pyulib/src/ulib/p/wop/__init__.py
diff --git a/pyulib/src/ulib/p/wop/uinst.py b/lib/pyulib/src/ulib/p/wop/uinst.py
similarity index 100%
rename from pyulib/src/ulib/p/wop/uinst.py
rename to lib/pyulib/src/ulib/p/wop/uinst.py
diff --git a/pyulib/src/ulib/sa/__init__.py b/lib/pyulib/src/ulib/sa/__init__.py
similarity index 100%
rename from pyulib/src/ulib/sa/__init__.py
rename to lib/pyulib/src/ulib/sa/__init__.py
diff --git a/pyulib/src/ulib/sa/dao.py b/lib/pyulib/src/ulib/sa/dao.py
similarity index 100%
rename from pyulib/src/ulib/sa/dao.py
rename to lib/pyulib/src/ulib/sa/dao.py
diff --git a/pyulib/src/ulib/sa/datetime.py b/lib/pyulib/src/ulib/sa/datetime.py
similarity index 100%
rename from pyulib/src/ulib/sa/datetime.py
rename to lib/pyulib/src/ulib/sa/datetime.py
diff --git a/pyulib/src/ulib/sa/props.py b/lib/pyulib/src/ulib/sa/props.py
similarity index 100%
rename from pyulib/src/ulib/sa/props.py
rename to lib/pyulib/src/ulib/sa/props.py
diff --git a/pyulib/src/ulib/tasks/__init__.py b/lib/pyulib/src/ulib/tasks/__init__.py
similarity index 100%
rename from pyulib/src/ulib/tasks/__init__.py
rename to lib/pyulib/src/ulib/tasks/__init__.py
diff --git a/pyulib/src/ulib/tasks/base.py b/lib/pyulib/src/ulib/tasks/base.py
similarity index 100%
rename from pyulib/src/ulib/tasks/base.py
rename to lib/pyulib/src/ulib/tasks/base.py
diff --git a/pyulib/src/ulib/tasks/consts.py b/lib/pyulib/src/ulib/tasks/consts.py
similarity index 100%
rename from pyulib/src/ulib/tasks/consts.py
rename to lib/pyulib/src/ulib/tasks/consts.py
diff --git a/pyulib/src/ulib/tasks/factories.py b/lib/pyulib/src/ulib/tasks/factories.py
similarity index 100%
rename from pyulib/src/ulib/tasks/factories.py
rename to lib/pyulib/src/ulib/tasks/factories.py
diff --git a/pyulib/src/ulib/tasks/httpclient.py b/lib/pyulib/src/ulib/tasks/httpclient.py
similarity index 100%
rename from pyulib/src/ulib/tasks/httpclient.py
rename to lib/pyulib/src/ulib/tasks/httpclient.py
diff --git a/pyulib/src/ulib/tasks/multiple.py b/lib/pyulib/src/ulib/tasks/multiple.py
similarity index 100%
rename from pyulib/src/ulib/tasks/multiple.py
rename to lib/pyulib/src/ulib/tasks/multiple.py
diff --git a/pyulib/src/ulib/tasks/projects.py b/lib/pyulib/src/ulib/tasks/projects.py
similarity index 100%
rename from pyulib/src/ulib/tasks/projects.py
rename to lib/pyulib/src/ulib/tasks/projects.py
diff --git a/pyulib/src/ulib/tasks/simple.py b/lib/pyulib/src/ulib/tasks/simple.py
similarity index 100%
rename from pyulib/src/ulib/tasks/simple.py
rename to lib/pyulib/src/ulib/tasks/simple.py
diff --git a/pyulib/src/ulib/tasks/store.py b/lib/pyulib/src/ulib/tasks/store.py
similarity index 100%
rename from pyulib/src/ulib/tasks/store.py
rename to lib/pyulib/src/ulib/tasks/store.py
diff --git a/pyulib/src/ulib/tasks/tasks.py b/lib/pyulib/src/ulib/tasks/tasks.py
similarity index 100%
rename from pyulib/src/ulib/tasks/tasks.py
rename to lib/pyulib/src/ulib/tasks/tasks.py
diff --git a/pyulib/src/ulib/tasks/tasksctl.py b/lib/pyulib/src/ulib/tasks/tasksctl.py
similarity index 100%
rename from pyulib/src/ulib/tasks/tasksctl.py
rename to lib/pyulib/src/ulib/tasks/tasksctl.py
diff --git a/pyulib/src/ulib/tasks/tasksrc.py b/lib/pyulib/src/ulib/tasks/tasksrc.py
similarity index 100%
rename from pyulib/src/ulib/tasks/tasksrc.py
rename to lib/pyulib/src/ulib/tasks/tasksrc.py
diff --git a/pyulib/src/ulib/templ/__init__.py b/lib/pyulib/src/ulib/templ/__init__.py
similarity index 100%
rename from pyulib/src/ulib/templ/__init__.py
rename to lib/pyulib/src/ulib/templ/__init__.py
diff --git a/pyulib/src/ulib/templ/base.py b/lib/pyulib/src/ulib/templ/base.py
similarity index 100%
rename from pyulib/src/ulib/templ/base.py
rename to lib/pyulib/src/ulib/templ/base.py
diff --git a/pyulib/src/ulib/templ/htmltempl.py b/lib/pyulib/src/ulib/templ/htmltempl.py
similarity index 100%
rename from pyulib/src/ulib/templ/htmltempl.py
rename to lib/pyulib/src/ulib/templ/htmltempl.py
diff --git a/pyulib/src/ulib/templ/javatempl.py b/lib/pyulib/src/ulib/templ/javatempl.py
similarity index 100%
rename from pyulib/src/ulib/templ/javatempl.py
rename to lib/pyulib/src/ulib/templ/javatempl.py
diff --git a/pyulib/src/ulib/templ/pytempl.py b/lib/pyulib/src/ulib/templ/pytempl.py
similarity index 100%
rename from pyulib/src/ulib/templ/pytempl.py
rename to lib/pyulib/src/ulib/templ/pytempl.py
diff --git a/pyulib/src/ulib/templ/wikitempl.py b/lib/pyulib/src/ulib/templ/wikitempl.py
similarity index 100%
rename from pyulib/src/ulib/templ/wikitempl.py
rename to lib/pyulib/src/ulib/templ/wikitempl.py
diff --git a/pyulib/src/ulib/templ/wotempl.py b/lib/pyulib/src/ulib/templ/wotempl.py
similarity index 100%
rename from pyulib/src/ulib/templ/wotempl.py
rename to lib/pyulib/src/ulib/templ/wotempl.py
diff --git a/pyulib/src/ulib/web/__init__.py b/lib/pyulib/src/ulib/web/__init__.py
similarity index 100%
rename from pyulib/src/ulib/web/__init__.py
rename to lib/pyulib/src/ulib/web/__init__.py
diff --git a/pyulib/src/ulib/web/api.py b/lib/pyulib/src/ulib/web/api.py
similarity index 100%
rename from pyulib/src/ulib/web/api.py
rename to lib/pyulib/src/ulib/web/api.py
diff --git a/pyulib/src/ulib/web/pages.py b/lib/pyulib/src/ulib/web/pages.py
similarity index 100%
rename from pyulib/src/ulib/web/pages.py
rename to lib/pyulib/src/ulib/web/pages.py
diff --git a/pyulib/test/Contacts.txt b/lib/pyulib/test/Contacts.txt
similarity index 100%
rename from pyulib/test/Contacts.txt
rename to lib/pyulib/test/Contacts.txt
diff --git a/pyulib/test/base.py b/lib/pyulib/test/base.py
similarity index 100%
rename from pyulib/test/base.py
rename to lib/pyulib/test/base.py
diff --git a/pyulib/test/run_tests b/lib/pyulib/test/run_tests
similarity index 100%
rename from pyulib/test/run_tests
rename to lib/pyulib/test/run_tests
diff --git a/pyulib/test/template.py b/lib/pyulib/test/template.py
similarity index 100%
rename from pyulib/test/template.py
rename to lib/pyulib/test/template.py
diff --git a/pyulib/test/test_all.py b/lib/pyulib/test/test_all.py
similarity index 100%
rename from pyulib/test/test_all.py
rename to lib/pyulib/test/test_all.py
diff --git a/pyulib/test/test_base/__init__.py b/lib/pyulib/test/test_base/__init__.py
similarity index 100%
rename from pyulib/test/test_base/__init__.py
rename to lib/pyulib/test/test_base/__init__.py
diff --git a/pyulib/test/test_base/base.py b/lib/pyulib/test/test_base/base.py
similarity index 100%
rename from pyulib/test/test_base/base.py
rename to lib/pyulib/test/test_base/base.py
diff --git a/pyulib/test/test_base/test.config b/lib/pyulib/test/test_base/test.config
similarity index 100%
rename from pyulib/test/test_base/test.config
rename to lib/pyulib/test/test_base/test.config
diff --git a/pyulib/test/test_base/test.sh_config b/lib/pyulib/test/test_base/test.sh_config
similarity index 100%
rename from pyulib/test/test_base/test.sh_config
rename to lib/pyulib/test/test_base/test.sh_config
diff --git a/pyulib/test/test_base/test_args.py b/lib/pyulib/test/test_base/test_args.py
similarity index 100%
rename from pyulib/test/test_base/test_args.py
rename to lib/pyulib/test/test_base/test_args.py
diff --git a/pyulib/test/test_base/test_base.py b/lib/pyulib/test/test_base/test_base.py
similarity index 100%
rename from pyulib/test/test_base/test_base.py
rename to lib/pyulib/test/test_base/test_base.py
diff --git a/pyulib/test/test_base/test_config.py b/lib/pyulib/test/test_base/test_config.py
similarity index 100%
rename from pyulib/test/test_base/test_config.py
rename to lib/pyulib/test/test_base/test_config.py
diff --git a/pyulib/test/test_base/test_control.py b/lib/pyulib/test/test_base/test_control.py
similarity index 100%
rename from pyulib/test/test_base/test_control.py
rename to lib/pyulib/test/test_base/test_control.py
diff --git a/pyulib/test/test_base/test_dates.py b/lib/pyulib/test/test_base/test_dates.py
similarity index 100%
rename from pyulib/test/test_base/test_dates.py
rename to lib/pyulib/test/test_base/test_dates.py
diff --git a/pyulib/test/test_base/test_editor.py b/lib/pyulib/test/test_base/test_editor.py
similarity index 100%
rename from pyulib/test/test_base/test_editor.py
rename to lib/pyulib/test/test_base/test_editor.py
diff --git a/pyulib/test/test_base/test_encdetect.py b/lib/pyulib/test/test_base/test_encdetect.py
similarity index 100%
rename from pyulib/test/test_base/test_encdetect.py
rename to lib/pyulib/test/test_base/test_encdetect.py
diff --git a/pyulib/test/test_base/test_encoding.py b/lib/pyulib/test/test_base/test_encoding.py
similarity index 100%
rename from pyulib/test/test_base/test_encoding.py
rename to lib/pyulib/test/test_base/test_encoding.py
diff --git a/pyulib/test/test_base/test_env.py b/lib/pyulib/test/test_base/test_env.py
similarity index 100%
rename from pyulib/test/test_base/test_env.py
rename to lib/pyulib/test/test_base/test_env.py
diff --git a/pyulib/test/test_base/test_files.py b/lib/pyulib/test/test_base/test_files.py
similarity index 100%
rename from pyulib/test/test_base/test_files.py
rename to lib/pyulib/test/test_base/test_files.py
diff --git a/pyulib/test/test_base/test_flock.py b/lib/pyulib/test/test_base/test_flock.py
similarity index 100%
rename from pyulib/test/test_base/test_flock.py
rename to lib/pyulib/test/test_base/test_flock.py
diff --git a/pyulib/test/test_base/test_functions.py b/lib/pyulib/test/test_base/test_functions.py
similarity index 100%
rename from pyulib/test/test_base/test_functions.py
rename to lib/pyulib/test/test_base/test_functions.py
diff --git a/pyulib/test/test_base/test_input.py b/lib/pyulib/test/test_base/test_input.py
similarity index 100%
rename from pyulib/test/test_base/test_input.py
rename to lib/pyulib/test/test_base/test_input.py
diff --git a/pyulib/test/test_base/test_iso8859.py b/lib/pyulib/test/test_base/test_iso8859.py
similarity index 100%
rename from pyulib/test/test_base/test_iso8859.py
rename to lib/pyulib/test/test_base/test_iso8859.py
diff --git a/pyulib/test/test_base/test_lines.py b/lib/pyulib/test/test_base/test_lines.py
similarity index 100%
rename from pyulib/test/test_base/test_lines.py
rename to lib/pyulib/test/test_base/test_lines.py
diff --git a/pyulib/test/test_base/test_output.py b/lib/pyulib/test/test_base/test_output.py
similarity index 100%
rename from pyulib/test/test_base/test_output.py
rename to lib/pyulib/test/test_base/test_output.py
diff --git a/pyulib/test/test_base/test_pager.py b/lib/pyulib/test/test_base/test_pager.py
similarity index 100%
rename from pyulib/test/test_base/test_pager.py
rename to lib/pyulib/test/test_base/test_pager.py
diff --git a/pyulib/test/test_base/test_paths.py b/lib/pyulib/test/test_base/test_paths.py
similarity index 100%
rename from pyulib/test/test_base/test_paths.py
rename to lib/pyulib/test/test_base/test_paths.py
diff --git a/pyulib/test/test_base/test_procs.py b/lib/pyulib/test/test_base/test_procs.py
similarity index 100%
rename from pyulib/test/test_base/test_procs.py
rename to lib/pyulib/test/test_base/test_procs.py
diff --git a/pyulib/test/test_base/test_times.py b/lib/pyulib/test/test_base/test_times.py
similarity index 100%
rename from pyulib/test/test_base/test_times.py
rename to lib/pyulib/test/test_base/test_times.py
diff --git a/pyulib/test/test_base/test_tmpfiles.py b/lib/pyulib/test/test_base/test_tmpfiles.py
similarity index 100%
rename from pyulib/test/test_base/test_tmpfiles.py
rename to lib/pyulib/test/test_base/test_tmpfiles.py
diff --git a/pyulib/test/test_base/test_uio.py b/lib/pyulib/test/test_base/test_uio.py
similarity index 100%
rename from pyulib/test/test_base/test_uio.py
rename to lib/pyulib/test/test_base/test_uio.py
diff --git a/pyulib/test/test_base/test_words.py b/lib/pyulib/test/test_base/test_words.py
similarity index 100%
rename from pyulib/test/test_base/test_words.py
rename to lib/pyulib/test/test_base/test_words.py
diff --git a/ulib/.ulib_version b/lib/ulib/.ulib_version
similarity index 100%
rename from ulib/.ulib_version
rename to lib/ulib/.ulib_version
diff --git a/ulib/DEFAULTS b/lib/ulib/DEFAULTS
similarity index 100%
rename from ulib/DEFAULTS
rename to lib/ulib/DEFAULTS
diff --git a/ulib/PREFIXES-DEFAULTS b/lib/ulib/PREFIXES-DEFAULTS
similarity index 100%
rename from ulib/PREFIXES-DEFAULTS
rename to lib/ulib/PREFIXES-DEFAULTS
diff --git a/ulib/apache b/lib/ulib/apache
similarity index 100%
rename from ulib/apache
rename to lib/ulib/apache
diff --git a/ulib/auto b/lib/ulib/auto
similarity index 100%
rename from ulib/auto
rename to lib/ulib/auto
diff --git a/ulib/awk b/lib/ulib/awk
similarity index 100%
rename from ulib/awk
rename to lib/ulib/awk
diff --git a/ulib/base b/lib/ulib/base
similarity index 100%
rename from ulib/base
rename to lib/ulib/base
diff --git a/ulib/bash b/lib/ulib/bash
similarity index 100%
rename from ulib/bash
rename to lib/ulib/bash
diff --git a/ulib/bash_completion b/lib/ulib/bash_completion
similarity index 100%
rename from ulib/bash_completion
rename to lib/ulib/bash_completion
diff --git a/ulib/cgi b/lib/ulib/cgi
similarity index 100%
rename from ulib/cgi
rename to lib/ulib/cgi
diff --git a/ulib/cgiupload b/lib/ulib/cgiupload
similarity index 100%
rename from ulib/cgiupload
rename to lib/ulib/cgiupload
diff --git a/ulib/compat b/lib/ulib/compat
similarity index 100%
rename from ulib/compat
rename to lib/ulib/compat
diff --git a/ulib/conf b/lib/ulib/conf
similarity index 100%
rename from ulib/conf
rename to lib/ulib/conf
diff --git a/ulib/crontab b/lib/ulib/crontab
similarity index 100%
rename from ulib/crontab
rename to lib/ulib/crontab
diff --git a/ulib/debian b/lib/ulib/debian
similarity index 100%
rename from ulib/debian
rename to lib/ulib/debian
diff --git a/ulib/install b/lib/ulib/install
similarity index 100%
rename from ulib/install
rename to lib/ulib/install
diff --git a/ulib/ipcalc b/lib/ulib/ipcalc
similarity index 100%
rename from ulib/ipcalc
rename to lib/ulib/ipcalc
diff --git a/ulib/java b/lib/ulib/java
similarity index 100%
rename from ulib/java
rename to lib/ulib/java
diff --git a/ulib/javaproperties b/lib/ulib/javaproperties
similarity index 100%
rename from ulib/javaproperties
rename to lib/ulib/javaproperties
diff --git a/ulib/json b/lib/ulib/json
similarity index 100%
rename from ulib/json
rename to lib/ulib/json
diff --git a/ulib/ldap b/lib/ulib/ldap
similarity index 100%
rename from ulib/ldap
rename to lib/ulib/ldap
diff --git a/ulib/ldif b/lib/ulib/ldif
similarity index 100%
rename from ulib/ldif
rename to lib/ulib/ldif
diff --git a/ulib/legacy b/lib/ulib/legacy
similarity index 100%
rename from ulib/legacy
rename to lib/ulib/legacy
diff --git a/ulib/macosx b/lib/ulib/macosx
similarity index 100%
rename from ulib/macosx
rename to lib/ulib/macosx
diff --git a/ulib/mkcrypt b/lib/ulib/mkcrypt
similarity index 100%
rename from ulib/mkcrypt
rename to lib/ulib/mkcrypt
diff --git a/ulib/modeline b/lib/ulib/modeline
similarity index 100%
rename from ulib/modeline
rename to lib/ulib/modeline
diff --git a/ulib/network-manager-service b/lib/ulib/network-manager-service
similarity index 100%
rename from ulib/network-manager-service
rename to lib/ulib/network-manager-service
diff --git a/ulib/nutools/.udir b/lib/ulib/nutools/.udir
similarity index 100%
rename from ulib/nutools/.udir
rename to lib/ulib/nutools/.udir
diff --git a/ulib/nutools/plbck b/lib/ulib/nutools/plbck
similarity index 100%
rename from ulib/nutools/plbck
rename to lib/ulib/nutools/plbck
diff --git a/ulib/nutools/plver b/lib/ulib/nutools/plver
similarity index 100%
rename from ulib/nutools/plver
rename to lib/ulib/nutools/plver
diff --git a/ulib/nutools/pyulib b/lib/ulib/nutools/pyulib
similarity index 100%
rename from ulib/nutools/pyulib
rename to lib/ulib/nutools/pyulib
diff --git a/ulib/nutools/uencdetect b/lib/ulib/nutools/uencdetect
similarity index 100%
rename from ulib/nutools/uencdetect
rename to lib/ulib/nutools/uencdetect
diff --git a/ulib/nutools/umail b/lib/ulib/nutools/umail
similarity index 100%
rename from ulib/nutools/umail
rename to lib/ulib/nutools/umail
diff --git a/ulib/password b/lib/ulib/password
similarity index 100%
rename from ulib/password
rename to lib/ulib/password
diff --git a/ulib/prefixes b/lib/ulib/prefixes
similarity index 100%
rename from ulib/prefixes
rename to lib/ulib/prefixes
diff --git a/ulib/pretty b/lib/ulib/pretty
similarity index 100%
rename from ulib/pretty
rename to lib/ulib/pretty
diff --git a/ulib/redhat b/lib/ulib/redhat
similarity index 100%
rename from ulib/redhat
rename to lib/ulib/redhat
diff --git a/ulib/runs b/lib/ulib/runs
similarity index 100%
rename from ulib/runs
rename to lib/ulib/runs
diff --git a/ulib/semver b/lib/ulib/semver
similarity index 100%
rename from ulib/semver
rename to lib/ulib/semver
diff --git a/ulib/service b/lib/ulib/service
similarity index 100%
rename from ulib/service
rename to lib/ulib/service
diff --git a/ulib/support/cgiscript b/lib/ulib/support/cgiscript
similarity index 100%
rename from ulib/support/cgiscript
rename to lib/ulib/support/cgiscript
diff --git a/ulib/support/cgiupload.py b/lib/ulib/support/cgiupload.py
similarity index 100%
rename from ulib/support/cgiupload.py
rename to lib/ulib/support/cgiupload.py
diff --git a/ulib/support/install-pubkeys.sh b/lib/ulib/support/install-pubkeys.sh
similarity index 100%
rename from ulib/support/install-pubkeys.sh
rename to lib/ulib/support/install-pubkeys.sh
diff --git a/ulib/support/mkcrypt.py b/lib/ulib/support/mkcrypt.py
similarity index 100%
rename from ulib/support/mkcrypt.py
rename to lib/ulib/support/mkcrypt.py
diff --git a/ulib/support/uinc.py b/lib/ulib/support/uinc.py
similarity index 100%
rename from ulib/support/uinc.py
rename to lib/ulib/support/uinc.py
diff --git a/ulib/support/uinst2s b/lib/ulib/support/uinst2s
similarity index 100%
rename from ulib/support/uinst2s
rename to lib/ulib/support/uinst2s
diff --git a/ulib/support/uinst2s_python b/lib/ulib/support/uinst2s_python
similarity index 100%
rename from ulib/support/uinst2s_python
rename to lib/ulib/support/uinst2s_python
diff --git a/ulib/support/woinst2s b/lib/ulib/support/woinst2s
similarity index 100%
rename from ulib/support/woinst2s
rename to lib/ulib/support/woinst2s
diff --git a/ulib/sysinfos b/lib/ulib/sysinfos
similarity index 100%
rename from ulib/sysinfos
rename to lib/ulib/sysinfos
diff --git a/ulib/tiddlywiki b/lib/ulib/tiddlywiki
similarity index 100%
rename from ulib/tiddlywiki
rename to lib/ulib/tiddlywiki
diff --git a/ulib/udir b/lib/ulib/udir
similarity index 100%
rename from ulib/udir
rename to lib/ulib/udir
diff --git a/ulib/uenv b/lib/ulib/uenv
similarity index 100%
rename from ulib/uenv
rename to lib/ulib/uenv
diff --git a/ulib/uenv_update b/lib/ulib/uenv_update
similarity index 100%
rename from ulib/uenv_update
rename to lib/ulib/uenv_update
diff --git a/ulib/uinc b/lib/ulib/uinc
similarity index 100%
rename from ulib/uinc
rename to lib/ulib/uinc
diff --git a/ulib/uinst b/lib/ulib/uinst
similarity index 100%
rename from ulib/uinst
rename to lib/ulib/uinst
diff --git a/ulib/ulib b/lib/ulib/ulib
similarity index 100%
rename from ulib/ulib
rename to lib/ulib/ulib
diff --git a/ulib/ulib_version b/lib/ulib/ulib_version
similarity index 100%
rename from ulib/ulib_version
rename to lib/ulib/ulib_version
diff --git a/ulib/ulibsh b/lib/ulib/ulibsh
similarity index 100%
rename from ulib/ulibsh
rename to lib/ulib/ulibsh
diff --git a/ulib/vcs b/lib/ulib/vcs
similarity index 100%
rename from ulib/vcs
rename to lib/ulib/vcs
diff --git a/ulib/virsh b/lib/ulib/virsh
similarity index 100%
rename from ulib/virsh
rename to lib/ulib/virsh
diff --git a/ulib/webobjects b/lib/ulib/webobjects
similarity index 100%
rename from ulib/webobjects
rename to lib/ulib/webobjects
diff --git a/ulib/woinst b/lib/ulib/woinst
similarity index 100%
rename from ulib/woinst
rename to lib/ulib/woinst
diff --git a/ulib/wondermonitor b/lib/ulib/wondermonitor
similarity index 100%
rename from ulib/wondermonitor
rename to lib/ulib/wondermonitor
diff --git a/ulib/wosign b/lib/ulib/wosign
similarity index 100%
rename from ulib/wosign
rename to lib/ulib/wosign
diff --git a/ulib/wotaskd b/lib/ulib/wotaskd
similarity index 100%
rename from ulib/wotaskd
rename to lib/ulib/wotaskd