diff --git a/plugins/pyloader/Makefile.am b/plugins/pyloader/Makefile.am
index 1a53c16..68c658d 100644
--- a/plugins/pyloader/Makefile.am
+++ b/plugins/pyloader/Makefile.am
@@ -89,18 +89,18 @@ libpyloader_la_LDFLAGS = \
 
 # Please keep this in sorted order:
 libpyloader_la_SOURCES = \
-               python_policy.cc \
-               python_policy_manager.cc \
-               hook.cc
+               src/python_policy.cc \
+               src/python_policy_manager.cc \
+               src/hook.cc
 
 noinst_HEADERS += \
-               python_policy.hh \
-               python_policy_manager.hh
+               src/python_policy.hh \
+               src/python_policy_manager.hh
 
 share_PYTHON = \
-               Abstract.py \
-               Policy.py \
-               ScriptAdapter.py
+               src/Abstract.py \
+               src/Policy.py \
+               src/ScriptAdapter.py
 
 # ############################################################
 #
@@ -108,18 +108,18 @@ share_PYTHON = \
 #
 # ############################################################
 
-proxies = sgpem.py
-wrappers = sgpem_wrap.cc
+proxies = src/sgpem.py
+wrappers = src/sgpem_wrap.cc
 
 share_LTLIBRARIES = _sgpem.la
 share_PYTHON += $(proxies)
 
 # static pattern rule
-$(proxies) $(wrappers) : sgpem.i
+$(proxies) $(wrappers) : src/sgpem.i
 	test -d "$(@D)" || mkdir -p -- "$(@D)"
 	$(SWIG) $(SWIG_PYTHON_OPT) -o $@  $<
 
-_sgpem_la_INTERFACES = sgpem.i
+_sgpem_la_INTERFACES = src/sgpem.i
 
 _sgpem_la_CPPFLAGS = \
                -I@top_srcdir@ \
@@ -143,8 +143,8 @@ MOSTLYCLEANFILES += $(proxies) $(wrappers)
 
 # built-in policies
 policies_PYTHON = \
-       builtin-policies/fcfs.py \
-       builtin-policies/sjf.py
+       src/builtin-policies/fcfs.py \
+       src/builtin-policies/sjf.py
 
 
 # ############################################################
@@ -158,39 +158,39 @@ if COND_TESTS
 # DEJATOOL = src/testsuite/example-test.exp
 
 noinst_PROGRAMS = \
-	testsuite/test-pyloader
+	src/testsuite/test-pyloader
 
-testsuite_test_pyloader_CPPFLAGS = \
+src_testsuite_test_pyloader_CPPFLAGS = \
                -I@top_srcdir@ \
 	       -DSHAREDIR="\"$(sharedir)\"" \
                $(PYTHON_CPPFLAGS) \
                $(GLIBMM_CFLAGS) \
                $(GTHREAD_CFLAGS) \
 	       $(SGPEMV2_CFLAGS)
-testsuite_test_pyloader_DEPENDENCIES = \
+src_testsuite_test_pyloader_DEPENDENCIES = \
                libpyloader.la
-testsuite_test_pyloader_LDFLAGS = \
+src_testsuite_test_pyloader_LDFLAGS = \
                $(SGPEMV2_LIBS) \
                $(GLIBMM_LIBS) \
 	       $(GTHREAD_LIBS) \
                $(PYTHON_LDFLAGS) \
                $(PYTHON_EXTRA_LIBS) \
                $(PYTHON_EXTRA_LDFLAGS)
-testsuite_test_pyloader_SOURCES = \
-               testsuite/test-python_loader.cc \
-               python_policy.cc \
-               python_policy_manager.cc
+src_testsuite_test_pyloader_SOURCES = \
+               src/testsuite/test-python_loader.cc \
+               src/python_policy.cc \
+               src/python_policy_manager.cc
 
-noinst_PYTHON += testsuite/python_loader_configure.py \
-               testsuite/python_loader_sort_queue.py \
-               testsuite/python_loader_is_preemptive.py \
-               testsuite/python_loader_get_time_slice.py
+noinst_PYTHON += src/testsuite/python_loader_configure.py \
+               src/testsuite/python_loader_sort_queue.py \
+               src/testsuite/python_loader_is_preemptive.py \
+               src/testsuite/python_loader_get_time_slice.py
 
 
 # Workaround an automake bug that leaves behind some files 
 # while it's finishing the distcheck target
 CLEANFILES += \
-	testsuite/.libs/test-pyloader
+	src/testsuite/.libs/test-pyloader
 
 endif #~ if COND_TESTS
 
diff --git a/plugins/pyloader/Abstract.py b/plugins/pyloader/src/Abstract.py
similarity index 100%
rename from plugins/pyloader/Abstract.py
rename to plugins/pyloader/src/Abstract.py
diff --git a/plugins/pyloader/Policy.py b/plugins/pyloader/src/Policy.py
similarity index 100%
rename from plugins/pyloader/Policy.py
rename to plugins/pyloader/src/Policy.py
diff --git a/plugins/pyloader/ScriptAdapter.py b/plugins/pyloader/src/ScriptAdapter.py
similarity index 100%
rename from plugins/pyloader/ScriptAdapter.py
rename to plugins/pyloader/src/ScriptAdapter.py
diff --git a/plugins/pyloader/builtin-policies/fcfs.py b/plugins/pyloader/src/builtin-policies/fcfs.py
similarity index 100%
rename from plugins/pyloader/builtin-policies/fcfs.py
rename to plugins/pyloader/src/builtin-policies/fcfs.py
diff --git a/plugins/pyloader/builtin-policies/sjf.py b/plugins/pyloader/src/builtin-policies/sjf.py
similarity index 100%
rename from plugins/pyloader/builtin-policies/sjf.py
rename to plugins/pyloader/src/builtin-policies/sjf.py
diff --git a/plugins/pyloader/hook.cc b/plugins/pyloader/src/hook.cc
similarity index 100%
rename from plugins/pyloader/hook.cc
rename to plugins/pyloader/src/hook.cc
diff --git a/plugins/pyloader/python_policy.cc b/plugins/pyloader/src/python_policy.cc
similarity index 100%
rename from plugins/pyloader/python_policy.cc
rename to plugins/pyloader/src/python_policy.cc
diff --git a/plugins/pyloader/python_policy.hh b/plugins/pyloader/src/python_policy.hh
similarity index 100%
rename from plugins/pyloader/python_policy.hh
rename to plugins/pyloader/src/python_policy.hh
diff --git a/plugins/pyloader/python_policy_manager.cc b/plugins/pyloader/src/python_policy_manager.cc
similarity index 100%
rename from plugins/pyloader/python_policy_manager.cc
rename to plugins/pyloader/src/python_policy_manager.cc
diff --git a/plugins/pyloader/python_policy_manager.hh b/plugins/pyloader/src/python_policy_manager.hh
similarity index 100%
rename from plugins/pyloader/python_policy_manager.hh
rename to plugins/pyloader/src/python_policy_manager.hh
diff --git a/plugins/pyloader/sgpem.i b/plugins/pyloader/src/sgpem.i
similarity index 100%
rename from plugins/pyloader/sgpem.i
rename to plugins/pyloader/src/sgpem.i
diff --git a/plugins/pyloader/testsuite/python_loader_configure.py b/plugins/pyloader/src/testsuite/python_loader_configure.py
similarity index 100%
rename from plugins/pyloader/testsuite/python_loader_configure.py
rename to plugins/pyloader/src/testsuite/python_loader_configure.py
diff --git a/plugins/pyloader/testsuite/python_loader_get_time_slice.py b/plugins/pyloader/src/testsuite/python_loader_get_time_slice.py
similarity index 100%
rename from plugins/pyloader/testsuite/python_loader_get_time_slice.py
rename to plugins/pyloader/src/testsuite/python_loader_get_time_slice.py
diff --git a/plugins/pyloader/testsuite/python_loader_is_preemptive.py b/plugins/pyloader/src/testsuite/python_loader_is_preemptive.py
similarity index 100%
rename from plugins/pyloader/testsuite/python_loader_is_preemptive.py
rename to plugins/pyloader/src/testsuite/python_loader_is_preemptive.py
diff --git a/plugins/pyloader/testsuite/python_loader_sort_queue.py b/plugins/pyloader/src/testsuite/python_loader_sort_queue.py
similarity index 100%
rename from plugins/pyloader/testsuite/python_loader_sort_queue.py
rename to plugins/pyloader/src/testsuite/python_loader_sort_queue.py
diff --git a/plugins/pyloader/testsuite/test-python_loader.cc b/plugins/pyloader/src/testsuite/test-python_loader.cc
similarity index 100%
rename from plugins/pyloader/testsuite/test-python_loader.cc
rename to plugins/pyloader/src/testsuite/test-python_loader.cc