Move python modules from source4/scripting/python/ to python/.

Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sat Mar  2 03:57:34 CET 2013 on sn-devel-104

120 files changed, 8 insertions, 8 deletions

diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 0bba2ec7a7..8074fb6efd 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -20,7 +20,7 @@
 #include <Python.h>
 #include "includes.h"
 #include "libcli/util/pyerrors.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "../libcli/nbt/libnbt.h"
 #include "lib/events/events.h"
 
diff --git a/source4/scripting/python/examples/dnsserver.py b/python/examples/dnsserver.py
index c65b1c4099..c65b1c4099 100755
--- a/source4/scripting/python/examples/dnsserver.py
+++ b/python/examples/dnsserver.py
diff --git a/source4/scripting/python/examples/netbios.py b/python/examples/netbios.py
index a29b09f051..a29b09f051 100644
--- a/source4/scripting/python/examples/netbios.py
+++ b/python/examples/netbios.py
diff --git a/source4/scripting/python/examples/samr.py b/python/examples/samr.py
index 9b8e31e434..9b8e31e434 100755
--- a/source4/scripting/python/examples/samr.py
+++ b/python/examples/samr.py
diff --git a/source4/scripting/python/examples/winreg.py b/python/examples/winreg.py
index 484a69b842..484a69b842 100755
--- a/source4/scripting/python/examples/winreg.py
+++ b/python/examples/winreg.py
diff --git a/source4/scripting/python/modules.c b/python/modules.c
index 78cdbc0d87..371f0d5a07 100644
--- a/source4/scripting/python/modules.c
+++ b/python/modules.c
@@ -19,7 +19,7 @@
 
 #include <Python.h>
 #include "includes.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "dynconfig/dynconfig.h"
 
 static bool PySys_PathPrepend(PyObject *list, const char *path)
diff --git a/source4/scripting/python/modules.h b/python/modules.h
index e7e97aa1bf..e7e97aa1bf 100644
--- a/source4/scripting/python/modules.h
+++ b/python/modules.h
diff --git a/source4/scripting/python/pyglue.c b/python/pyglue.c
index 735f03a1e1..735f03a1e1 100644
--- a/source4/scripting/python/pyglue.c
+++ b/python/pyglue.c
diff --git a/source4/scripting/python/samba/__init__.py b/python/samba/__init__.py
index cd2a309fc0..cd2a309fc0 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/python/samba/__init__.py
diff --git a/source4/scripting/python/samba/common.py b/python/samba/common.py
index e47f276f81..e47f276f81 100644
--- a/source4/scripting/python/samba/common.py
+++ b/python/samba/common.py
diff --git a/source4/scripting/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 06fd82752f..06fd82752f 100644
--- a/source4/scripting/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
diff --git a/source4/scripting/python/samba/drs_utils.py b/python/samba/drs_utils.py
index 6e2cfea9ab..6e2cfea9ab 100644
--- a/source4/scripting/python/samba/drs_utils.py
+++ b/python/samba/drs_utils.py
diff --git a/source4/scripting/python/samba/getopt.py b/python/samba/getopt.py
index c3c080084e..c3c080084e 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/python/samba/getopt.py
diff --git a/source4/scripting/python/samba/hostconfig.py b/python/samba/hostconfig.py
index a66fbc2313..a66fbc2313 100644
--- a/source4/scripting/python/samba/hostconfig.py
+++ b/python/samba/hostconfig.py
diff --git a/source4/scripting/python/samba/idmap.py b/python/samba/idmap.py
index 0cb729fbc2..0cb729fbc2 100644
--- a/source4/scripting/python/samba/idmap.py
+++ b/python/samba/idmap.py
diff --git a/source4/scripting/python/samba/join.py b/python/samba/join.py
index c55c22cad5..c55c22cad5 100644
--- a/source4/scripting/python/samba/join.py
+++ b/python/samba/join.py
diff --git a/source4/scripting/python/samba/kcc_utils.py b/python/samba/kcc_utils.py
index 57c31876a6..57c31876a6 100644
--- a/source4/scripting/python/samba/kcc_utils.py
+++ b/python/samba/kcc_utils.py
diff --git a/source4/scripting/python/samba/ms_display_specifiers.py b/python/samba/ms_display_specifiers.py
index 44dfba07b3..44dfba07b3 100644
--- a/source4/scripting/python/samba/ms_display_specifiers.py
+++ b/python/samba/ms_display_specifiers.py
diff --git a/source4/scripting/python/samba/ms_schema.py b/python/samba/ms_schema.py
index c16693c9b5..c16693c9b5 100644
--- a/source4/scripting/python/samba/ms_schema.py
+++ b/python/samba/ms_schema.py
diff --git a/source4/scripting/python/samba/ndr.py b/python/samba/ndr.py
index 39e4a482ef..39e4a482ef 100644
--- a/source4/scripting/python/samba/ndr.py
+++ b/python/samba/ndr.py
diff --git a/source4/scripting/python/samba/netcmd/__init__.py b/python/samba/netcmd/__init__.py
index a3edf50516..a3edf50516 100644
--- a/source4/scripting/python/samba/netcmd/__init__.py
+++ b/python/samba/netcmd/__init__.py
diff --git a/source4/scripting/python/samba/netcmd/common.py b/python/samba/netcmd/common.py
index 5c0bd95f08..5c0bd95f08 100644
--- a/source4/scripting/python/samba/netcmd/common.py
+++ b/python/samba/netcmd/common.py
diff --git a/source4/scripting/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
index 889b0ff075..889b0ff075 100644
--- a/source4/scripting/python/samba/netcmd/dbcheck.py
+++ b/python/samba/netcmd/dbcheck.py
diff --git a/source4/scripting/python/samba/netcmd/delegation.py b/python/samba/netcmd/delegation.py
index 47dffb07d5..47dffb07d5 100644
--- a/source4/scripting/python/samba/netcmd/delegation.py
+++ b/python/samba/netcmd/delegation.py
diff --git a/source4/scripting/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py
index c00d17ad72..c00d17ad72 100644
--- a/source4/scripting/python/samba/netcmd/dns.py
+++ b/python/samba/netcmd/dns.py
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 4ba305c271..4ba305c271 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
diff --git a/source4/scripting/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py
index ff8d8304eb..ff8d8304eb 100644
--- a/source4/scripting/python/samba/netcmd/drs.py
+++ b/python/samba/netcmd/drs.py
diff --git a/source4/scripting/python/samba/netcmd/dsacl.py b/python/samba/netcmd/dsacl.py
index 28aa843adb..28aa843adb 100644
--- a/source4/scripting/python/samba/netcmd/dsacl.py
+++ b/python/samba/netcmd/dsacl.py
diff --git a/source4/scripting/python/samba/netcmd/fsmo.py b/python/samba/netcmd/fsmo.py
index c938c915fa..c938c915fa 100644
--- a/source4/scripting/python/samba/netcmd/fsmo.py
+++ b/python/samba/netcmd/fsmo.py
diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index 23b562eb63..23b562eb63 100644
--- a/source4/scripting/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
diff --git a/source4/scripting/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 731d4c1564..731d4c1564 100644
--- a/source4/scripting/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index 8398205e4b..8398205e4b 100644
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
diff --git a/source4/scripting/python/samba/netcmd/main.py b/python/samba/netcmd/main.py
index 5f78823588..5f78823588 100644
--- a/source4/scripting/python/samba/netcmd/main.py
+++ b/python/samba/netcmd/main.py
diff --git a/source4/scripting/python/samba/netcmd/ntacl.py b/python/samba/netcmd/ntacl.py
index 6d4d350653..6d4d350653 100644
--- a/source4/scripting/python/samba/netcmd/ntacl.py
+++ b/python/samba/netcmd/ntacl.py
diff --git a/source4/scripting/python/samba/netcmd/processes.py b/python/samba/netcmd/processes.py
index b25a2e453e..b25a2e453e 100644
--- a/source4/scripting/python/samba/netcmd/processes.py
+++ b/python/samba/netcmd/processes.py
diff --git a/source4/scripting/python/samba/netcmd/rodc.py b/python/samba/netcmd/rodc.py
index 2dc6112a30..2dc6112a30 100644
--- a/source4/scripting/python/samba/netcmd/rodc.py
+++ b/python/samba/netcmd/rodc.py
diff --git a/source4/scripting/python/samba/netcmd/sites.py b/python/samba/netcmd/sites.py
index 09df55ec9c..09df55ec9c 100644
--- a/source4/scripting/python/samba/netcmd/sites.py
+++ b/python/samba/netcmd/sites.py
diff --git a/source4/scripting/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py
index 03d072ec9b..03d072ec9b 100644
--- a/source4/scripting/python/samba/netcmd/spn.py
+++ b/python/samba/netcmd/spn.py
diff --git a/source4/scripting/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py
index 9251469421..9251469421 100644
--- a/source4/scripting/python/samba/netcmd/testparm.py
+++ b/python/samba/netcmd/testparm.py
diff --git a/source4/scripting/python/samba/netcmd/time.py b/python/samba/netcmd/time.py
index 694b6adda9..694b6adda9 100644
--- a/source4/scripting/python/samba/netcmd/time.py
+++ b/python/samba/netcmd/time.py
diff --git a/source4/scripting/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index b98ec344b2..b98ec344b2 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
diff --git a/source4/scripting/python/samba/netcmd/vampire.py b/python/samba/netcmd/vampire.py
index b12222e79e..b12222e79e 100644
--- a/source4/scripting/python/samba/netcmd/vampire.py
+++ b/python/samba/netcmd/vampire.py
diff --git a/source4/scripting/python/samba/ntacls.py b/python/samba/ntacls.py
index 53438d84bf..53438d84bf 100644
--- a/source4/scripting/python/samba/ntacls.py
+++ b/python/samba/ntacls.py
diff --git a/source4/scripting/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index aac0ee36b2..aac0ee36b2 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
diff --git a/source4/scripting/python/samba/provision/backend.py b/python/samba/provision/backend.py
index f88b0db89c..f88b0db89c 100644
--- a/source4/scripting/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
diff --git a/source4/scripting/python/samba/provision/common.py b/python/samba/provision/common.py
index f96704bcce..f96704bcce 100644
--- a/source4/scripting/python/samba/provision/common.py
+++ b/python/samba/provision/common.py
diff --git a/source4/scripting/python/samba/provision/descriptor.py b/python/samba/provision/descriptor.py
index 32e91ed2b5..32e91ed2b5 100644
--- a/source4/scripting/python/samba/provision/descriptor.py
+++ b/python/samba/provision/descriptor.py
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 4522683fe8..4522683fe8 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
diff --git a/source4/scripting/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py
index acccff4e29..acccff4e29 100644
--- a/source4/scripting/python/samba/samba3/__init__.py
+++ b/python/samba/samba3/__init__.py
diff --git a/source4/scripting/python/samba/samdb.py b/python/samba/samdb.py
index 2dfc839519..2dfc839519 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/python/samba/samdb.py
diff --git a/source4/scripting/python/samba/schema.py b/python/samba/schema.py
index 5c8f506f26..5c8f506f26 100644
--- a/source4/scripting/python/samba/schema.py
+++ b/python/samba/schema.py
diff --git a/source4/scripting/python/samba/sd_utils.py b/python/samba/sd_utils.py
index ded9bfc192..ded9bfc192 100644
--- a/source4/scripting/python/samba/sd_utils.py
+++ b/python/samba/sd_utils.py
diff --git a/source4/scripting/python/samba/sites.py b/python/samba/sites.py
index 76c57dd11c..76c57dd11c 100644
--- a/source4/scripting/python/samba/sites.py
+++ b/python/samba/sites.py
diff --git a/source4/scripting/python/samba/tdb_util.py b/python/samba/tdb_util.py
index d967434e5b..d967434e5b 100644
--- a/source4/scripting/python/samba/tdb_util.py
+++ b/python/samba/tdb_util.py
diff --git a/source4/scripting/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index 2df30a641b..2df30a641b 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
diff --git a/source4/scripting/python/samba/tests/auth.py b/python/samba/tests/auth.py
index f71e1a784d..f71e1a784d 100644
--- a/source4/scripting/python/samba/tests/auth.py
+++ b/python/samba/tests/auth.py
diff --git a/source4/scripting/python/samba/tests/blackbox/__init__.py b/python/samba/tests/blackbox/__init__.py
index 361e5cfe5e..361e5cfe5e 100644
--- a/source4/scripting/python/samba/tests/blackbox/__init__.py
+++ b/python/samba/tests/blackbox/__init__.py
diff --git a/source4/scripting/python/samba/tests/blackbox/ndrdump.py b/python/samba/tests/blackbox/ndrdump.py
index fca9a93153..fca9a93153 100644
--- a/source4/scripting/python/samba/tests/blackbox/ndrdump.py
+++ b/python/samba/tests/blackbox/ndrdump.py
diff --git a/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py b/python/samba/tests/blackbox/samba_tool_drs.py
index 62d7bf123b..62d7bf123b 100644
--- a/source4/scripting/python/samba/tests/blackbox/samba_tool_drs.py
+++ b/python/samba/tests/blackbox/samba_tool_drs.py
diff --git a/source4/scripting/python/samba/tests/common.py b/python/samba/tests/common.py
index 8794e9dc8b..8794e9dc8b 100644
--- a/source4/scripting/python/samba/tests/common.py
+++ b/python/samba/tests/common.py
diff --git a/source4/scripting/python/samba/tests/core.py b/python/samba/tests/core.py
index 8206e68d4f..8206e68d4f 100644
--- a/source4/scripting/python/samba/tests/core.py
+++ b/python/samba/tests/core.py
diff --git a/source4/scripting/python/samba/tests/credentials.py b/python/samba/tests/credentials.py
index 95ee0fa0de..95ee0fa0de 100644
--- a/source4/scripting/python/samba/tests/credentials.py
+++ b/python/samba/tests/credentials.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/__init__.py b/python/samba/tests/dcerpc/__init__.py
index d84cb57a09..d84cb57a09 100644
--- a/source4/scripting/python/samba/tests/dcerpc/__init__.py
+++ b/python/samba/tests/dcerpc/__init__.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/bare.py b/python/samba/tests/dcerpc/bare.py
index 3efbf9d4cf..3efbf9d4cf 100644
--- a/source4/scripting/python/samba/tests/dcerpc/bare.py
+++ b/python/samba/tests/dcerpc/bare.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py
index 59d6eee761..59d6eee761 100644
--- a/source4/scripting/python/samba/tests/dcerpc/dnsserver.py
+++ b/python/samba/tests/dcerpc/dnsserver.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/misc.py b/python/samba/tests/dcerpc/misc.py
index 11e14aadfa..11e14aadfa 100644
--- a/source4/scripting/python/samba/tests/dcerpc/misc.py
+++ b/python/samba/tests/dcerpc/misc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/registry.py b/python/samba/tests/dcerpc/registry.py
index c7bcbfd530..c7bcbfd530 100644
--- a/source4/scripting/python/samba/tests/dcerpc/registry.py
+++ b/python/samba/tests/dcerpc/registry.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py b/python/samba/tests/dcerpc/rpc_talloc.py
index c091f26c1b..c091f26c1b 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpc_talloc.py
+++ b/python/samba/tests/dcerpc/rpc_talloc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py b/python/samba/tests/dcerpc/rpcecho.py
index 099f8f619c..099f8f619c 100644
--- a/source4/scripting/python/samba/tests/dcerpc/rpcecho.py
+++ b/python/samba/tests/dcerpc/rpcecho.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/sam.py b/python/samba/tests/dcerpc/sam.py
index 0e09323adb..0e09323adb 100644
--- a/source4/scripting/python/samba/tests/dcerpc/sam.py
+++ b/python/samba/tests/dcerpc/sam.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/srvsvc.py b/python/samba/tests/dcerpc/srvsvc.py
index 3206a27e67..3206a27e67 100644
--- a/source4/scripting/python/samba/tests/dcerpc/srvsvc.py
+++ b/python/samba/tests/dcerpc/srvsvc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/testrpc.py b/python/samba/tests/dcerpc/testrpc.py
index e35d6b5544..e35d6b5544 100644
--- a/source4/scripting/python/samba/tests/dcerpc/testrpc.py
+++ b/python/samba/tests/dcerpc/testrpc.py
diff --git a/source4/scripting/python/samba/tests/dcerpc/unix.py b/python/samba/tests/dcerpc/unix.py
index e8ef4da863..e8ef4da863 100644
--- a/source4/scripting/python/samba/tests/dcerpc/unix.py
+++ b/python/samba/tests/dcerpc/unix.py
diff --git a/source4/scripting/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 49d699edb7..49d699edb7 100644
--- a/source4/scripting/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
diff --git a/source4/scripting/python/samba/tests/docs.py b/python/samba/tests/docs.py
index c1b371680d..c1b371680d 100644
--- a/source4/scripting/python/samba/tests/docs.py
+++ b/python/samba/tests/docs.py
diff --git a/source4/scripting/python/samba/tests/dsdb.py b/python/samba/tests/dsdb.py
index 3aef1d2fa4..3aef1d2fa4 100644
--- a/source4/scripting/python/samba/tests/dsdb.py
+++ b/python/samba/tests/dsdb.py
diff --git a/source4/scripting/python/samba/tests/gensec.py b/python/samba/tests/gensec.py
index e270c418ea..e270c418ea 100644
--- a/source4/scripting/python/samba/tests/gensec.py
+++ b/python/samba/tests/gensec.py
diff --git a/source4/scripting/python/samba/tests/getopt.py b/python/samba/tests/getopt.py
index 14ee0a7428..14ee0a7428 100644
--- a/source4/scripting/python/samba/tests/getopt.py
+++ b/python/samba/tests/getopt.py
diff --git a/source4/scripting/python/samba/tests/hostconfig.py b/python/samba/tests/hostconfig.py
index 526dc0fe4e..526dc0fe4e 100644
--- a/source4/scripting/python/samba/tests/hostconfig.py
+++ b/python/samba/tests/hostconfig.py
diff --git a/source4/scripting/python/samba/tests/libsmb_samba_internal.py b/python/samba/tests/libsmb_samba_internal.py
index fe9f197a2c..fe9f197a2c 100644
--- a/source4/scripting/python/samba/tests/libsmb_samba_internal.py
+++ b/python/samba/tests/libsmb_samba_internal.py
diff --git a/source4/scripting/python/samba/tests/messaging.py b/python/samba/tests/messaging.py
index f0cd368195..f0cd368195 100644
--- a/source4/scripting/python/samba/tests/messaging.py
+++ b/python/samba/tests/messaging.py
diff --git a/source4/scripting/python/samba/tests/netcmd.py b/python/samba/tests/netcmd.py
index 2cbac4e8bf..2cbac4e8bf 100644
--- a/source4/scripting/python/samba/tests/netcmd.py
+++ b/python/samba/tests/netcmd.py
diff --git a/source4/scripting/python/samba/tests/ntacls.py b/python/samba/tests/ntacls.py
index aa9ef6852b..aa9ef6852b 100644
--- a/source4/scripting/python/samba/tests/ntacls.py
+++ b/python/samba/tests/ntacls.py
diff --git a/source4/scripting/python/samba/tests/param.py b/python/samba/tests/param.py
index f539eba140..f539eba140 100644
--- a/source4/scripting/python/samba/tests/param.py
+++ b/python/samba/tests/param.py
diff --git a/source4/scripting/python/samba/tests/policy.py b/python/samba/tests/policy.py
index b245745152..b245745152 100644
--- a/source4/scripting/python/samba/tests/policy.py
+++ b/python/samba/tests/policy.py
diff --git a/source4/scripting/python/samba/tests/posixacl.py b/python/samba/tests/posixacl.py
index 7cd22ebccd..7cd22ebccd 100644
--- a/source4/scripting/python/samba/tests/posixacl.py
+++ b/python/samba/tests/posixacl.py
diff --git a/source4/scripting/python/samba/tests/provision.py b/python/samba/tests/provision.py
index 929e7074f7..929e7074f7 100644
--- a/source4/scripting/python/samba/tests/provision.py
+++ b/python/samba/tests/provision.py
diff --git a/source4/scripting/python/samba/tests/registry.py b/python/samba/tests/registry.py
index 8016a0bb68..8016a0bb68 100644
--- a/source4/scripting/python/samba/tests/registry.py
+++ b/python/samba/tests/registry.py
diff --git a/source4/scripting/python/samba/tests/samba3.py b/python/samba/tests/samba3.py
index 0a7f13c66f..0a7f13c66f 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/python/samba/tests/samba3.py
diff --git a/source4/scripting/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py
index 9c017fb79c..9c017fb79c 100644
--- a/source4/scripting/python/samba/tests/samba3sam.py
+++ b/python/samba/tests/samba3sam.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/__init__.py b/python/samba/tests/samba_tool/__init__.py
index 3d7f0591e2..3d7f0591e2 100644
--- a/source4/scripting/python/samba/tests/samba_tool/__init__.py
+++ b/python/samba/tests/samba_tool/__init__.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py
index 60ccaa543d..60ccaa543d 100644
--- a/source4/scripting/python/samba/tests/samba_tool/base.py
+++ b/python/samba/tests/samba_tool/base.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py
index e20a97794a..e20a97794a 100644
--- a/source4/scripting/python/samba/tests/samba_tool/gpo.py
+++ b/python/samba/tests/samba_tool/gpo.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py
index 2c0c46e5dc..2c0c46e5dc 100644
--- a/source4/scripting/python/samba/tests/samba_tool/group.py
+++ b/python/samba/tests/samba_tool/group.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/ntacl.py b/python/samba/tests/samba_tool/ntacl.py
index 2a329fe7d4..2a329fe7d4 100644
--- a/source4/scripting/python/samba/tests/samba_tool/ntacl.py
+++ b/python/samba/tests/samba_tool/ntacl.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/processes.py b/python/samba/tests/samba_tool/processes.py
index 91a5266b54..91a5266b54 100644
--- a/source4/scripting/python/samba/tests/samba_tool/processes.py
+++ b/python/samba/tests/samba_tool/processes.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/timecmd.py b/python/samba/tests/samba_tool/timecmd.py
index 000f0f2828..000f0f2828 100644
--- a/source4/scripting/python/samba/tests/samba_tool/timecmd.py
+++ b/python/samba/tests/samba_tool/timecmd.py
diff --git a/source4/scripting/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py
index 33344cd3d3..33344cd3d3 100644
--- a/source4/scripting/python/samba/tests/samba_tool/user.py
+++ b/python/samba/tests/samba_tool/user.py
diff --git a/source4/scripting/python/samba/tests/samdb.py b/python/samba/tests/samdb.py
index 5c80391cba..5c80391cba 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/python/samba/tests/samdb.py
diff --git a/source4/scripting/python/samba/tests/security.py b/python/samba/tests/security.py
index d2938aacb0..d2938aacb0 100644
--- a/source4/scripting/python/samba/tests/security.py
+++ b/python/samba/tests/security.py
diff --git a/source4/scripting/python/samba/tests/source.py b/python/samba/tests/source.py
index 2612ae68cf..2612ae68cf 100644
--- a/source4/scripting/python/samba/tests/source.py
+++ b/python/samba/tests/source.py
diff --git a/source4/scripting/python/samba/tests/strings.py b/python/samba/tests/strings.py
index 23382d756e..23382d756e 100644
--- a/source4/scripting/python/samba/tests/strings.py
+++ b/python/samba/tests/strings.py
diff --git a/source4/scripting/python/samba/tests/unicodenames.py b/python/samba/tests/unicodenames.py
index ed65de6651..ed65de6651 100644
--- a/source4/scripting/python/samba/tests/unicodenames.py
+++ b/python/samba/tests/unicodenames.py
diff --git a/source4/scripting/python/samba/tests/upgrade.py b/python/samba/tests/upgrade.py
index b46a417319..b46a417319 100644
--- a/source4/scripting/python/samba/tests/upgrade.py
+++ b/python/samba/tests/upgrade.py
diff --git a/source4/scripting/python/samba/tests/upgradeprovision.py b/python/samba/tests/upgradeprovision.py
index 93a6731c83..93a6731c83 100644
--- a/source4/scripting/python/samba/tests/upgradeprovision.py
+++ b/python/samba/tests/upgradeprovision.py
diff --git a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
index a7cb298ed7..a7cb298ed7 100644
--- a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py
+++ b/python/samba/tests/upgradeprovisionneeddc.py
diff --git a/source4/scripting/python/samba/tests/xattr.py b/python/samba/tests/xattr.py
index 89add28456..89add28456 100644
--- a/source4/scripting/python/samba/tests/xattr.py
+++ b/python/samba/tests/xattr.py
diff --git a/source4/scripting/python/samba/upgrade.py b/python/samba/upgrade.py
index d680a7ca23..d680a7ca23 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/python/samba/upgrade.py
diff --git a/source4/scripting/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index 1ec19d4ab6..1ec19d4ab6 100644
--- a/source4/scripting/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
diff --git a/source4/scripting/python/samba/web_server/__init__.py b/python/samba/web_server/__init__.py
index 78ce953c61..78ce953c61 100644
--- a/source4/scripting/python/samba/web_server/__init__.py
+++ b/python/samba/web_server/__init__.py
diff --git a/source4/scripting/python/samba/xattr.py b/python/samba/xattr.py
index 8516ba99ca..8516ba99ca 100644
--- a/source4/scripting/python/samba/xattr.py
+++ b/python/samba/xattr.py
diff --git a/source4/scripting/python/samba_external/README b/python/samba_external/README
index d6a4dec7b1..d6a4dec7b1 100644
--- a/source4/scripting/python/samba_external/README
+++ b/python/samba_external/README
diff --git a/source4/scripting/python/uuidmodule.c b/python/uuidmodule.c
index 3bfe0162ca..3bfe0162ca 100644
--- a/source4/scripting/python/uuidmodule.c
+++ b/python/uuidmodule.c
diff --git a/source4/scripting/python/wscript_build b/python/wscript_build
index a40b5834f9..a40b5834f9 100644
--- a/source4/scripting/python/wscript_build
+++ b/python/wscript_build
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index a84fbf8e71..02e5ae28ce 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -22,7 +22,7 @@
 #include "auth/gensec/gensec.h"
 #include "auth/credentials/pycredentials.h"
 #include "libcli/util/pyerrors.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include <pytalloc.h>
 #include <tevent.h>
 #include "librpc/rpc/pyrpc_util.h"
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 3901d4d599..d035fb024a 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -21,7 +21,7 @@
 
 #include <Python.h>
 #include "includes.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "libcli/util/pyerrors.h"
 #include "librpc/rpc/pyrpc_util.h"
 #include "librpc/ndr/libndr.h"
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 298e1c3bfa..cdd28d8542 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -26,7 +26,7 @@
 #include "param/provision.h"
 #include "param/secrets.h"
 #include <pytalloc.h>
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 #include "param/pyparam.h"
 #include "dynconfig/dynconfig.h"
 
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun
index 15a78bf499..918195e842 100755
--- a/source4/scripting/bin/subunitrun
+++ b/source4/scripting/bin/subunitrun
@@ -49,7 +49,7 @@ import samba.tests
 usage = 'subunitrun [options] <tests>'
 description = '''
 This runs a Samba python test suite. The tests are typically located in
-source4/scripting/python/samba/tests/*.py
+python/samba/tests/*.py
 
 To run the tests from one of those modules, specify the test as
 samba.tests.MODULE. For example, to run the tests in common.py:
diff --git a/source4/web_server/wsgi.c b/source4/web_server/wsgi.c
index 17ad65afe4..f0e7bd59b8 100644
--- a/source4/web_server/wsgi.c
+++ b/source4/web_server/wsgi.c
@@ -26,7 +26,7 @@
 #include "../lib/util/dlinklist.h"
 #include "lib/tls/tls.h"
 #include "lib/tsocket/tsocket.h"
-#include "scripting/python/modules.h"
+#include "python/modules.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
diff --git a/wscript_build b/wscript_build
index ec673cee13..f0c9f2a5b3 100644
--- a/wscript_build
+++ b/wscript_build
@@ -40,7 +40,7 @@ bld.RECURSE('lib/ldb')
 bld.RECURSE('lib/param')
 bld.RECURSE('dynconfig')
 bld.RECURSE('lib/util/charset')
-bld.RECURSE('source4/scripting/python')
+bld.RECURSE('python')
 bld.RECURSE('source4/param')
 bld.RECURSE('source4/librpc')
 bld.RECURSE('source4/dsdb')