cleanups; restructured code
drwxr-xr-x - util-vserver