diff --git a/Makefile.am b/Makefile.am
index f67a2c4..f2d231a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # Subdirectories
-SUBDIRS = src pyext test caldb models examples scripts
+SUBDIRS = src pyext test caldb models examples cscripts
 
 # Pkgconfig directory
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index 111ac8a..37dd5af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -900,7 +900,7 @@ AC_CONFIG_FILES([Makefile
                  caldb/Makefile
                  models/Makefile
                  examples/Makefile
-                 scripts/Makefile
+                 cscripts/Makefile
                  ctools.pc
                  testconf.sh],
                 [if test -f test/test_cscripts.sh; then chmod +x test/test_cscripts.sh; fi;
diff --git a/scripts/Makefile.am b/cscripts/Makefile.am
index 0a456ec..0a456ec 100644
--- a/scripts/Makefile.am
+++ b/cscripts/Makefile.am
diff --git a/scripts/__init__.py b/cscripts/__init__.py
index 56aa7ae..56aa7ae 100644
--- a/scripts/__init__.py
+++ b/cscripts/__init__.py
diff --git a/scripts/cscaldb.py b/cscripts/cscaldb.py
index 018b568..018b568 100755
--- a/scripts/cscaldb.py
+++ b/cscripts/cscaldb.py
diff --git a/scripts/cshessobs.py b/cscripts/cshessobs.py
index 9d0482e..9d0482e 100755
--- a/scripts/cshessobs.py
+++ b/cscripts/cshessobs.py
diff --git a/scripts/csinfo.py b/cscripts/csinfo.py
index 9fb4219..9fb4219 100755
--- a/scripts/csinfo.py
+++ b/cscripts/csinfo.py
diff --git a/scripts/cslightcrv.py b/cscripts/cslightcrv.py
index 6252230..6252230 100755
--- a/scripts/cslightcrv.py
+++ b/cscripts/cslightcrv.py
diff --git a/scripts/csobsdef.py b/cscripts/csobsdef.py
index 69c919e..69c919e 100755
--- a/scripts/csobsdef.py
+++ b/cscripts/csobsdef.py
diff --git a/scripts/cspull.py b/cscripts/cspull.py
index 7d08775..7d08775 100755
--- a/scripts/cspull.py
+++ b/cscripts/cspull.py
diff --git a/scripts/csresmap.py b/cscripts/csresmap.py
index c64adbe..c64adbe 100755
--- a/scripts/csresmap.py
+++ b/cscripts/csresmap.py
diff --git a/scripts/cssens.py b/cscripts/cssens.py
index 0fbfb3b..0fbfb3b 100755
--- a/scripts/cssens.py
+++ b/cscripts/cssens.py
diff --git a/scripts/csspec.py b/cscripts/csspec.py
index 65ad310..65ad310 100755
--- a/scripts/csspec.py
+++ b/cscripts/csspec.py
diff --git a/scripts/cstsdist.py b/cscripts/cstsdist.py
index a428bbd..a428bbd 100755
--- a/scripts/cstsdist.py
+++ b/cscripts/cstsdist.py
diff --git a/scripts/cta_kb_bkgrates.py b/cscripts/cta_kb_bkgrates.py
index 4c473e0..4c473e0 100755
--- a/scripts/cta_kb_bkgrates.py
+++ b/cscripts/cta_kb_bkgrates.py
diff --git a/scripts/cta_kb_root2caldb.py b/cscripts/cta_kb_root2caldb.py
index 37c8244..37c8244 100755
--- a/scripts/cta_kb_root2caldb.py
+++ b/cscripts/cta_kb_root2caldb.py
diff --git a/scripts/cta_make_nodes.py b/cscripts/cta_make_nodes.py
index 9555a15..9555a15 100755
--- a/scripts/cta_make_nodes.py
+++ b/cscripts/cta_make_nodes.py
diff --git a/scripts/cta_root2caldb.py b/cscripts/cta_root2caldb.py
index 7c4e062..7c4e062 100755
--- a/scripts/cta_root2caldb.py
+++ b/cscripts/cta_root2caldb.py
diff --git a/scripts/cta_root2irf.py b/cscripts/cta_root2irf.py
index 466750e..466750e 100755
--- a/scripts/cta_root2irf.py
+++ b/cscripts/cta_root2irf.py
diff --git a/scripts/lsmodel.py b/cscripts/lsmodel.py
index 6cfd031..6cfd031 100755
--- a/scripts/lsmodel.py
+++ b/cscripts/lsmodel.py
diff --git a/scripts/obsutils.py b/cscripts/obsutils.py
index ca125c8..ca125c8 100755
--- a/scripts/obsutils.py
+++ b/cscripts/obsutils.py
diff --git a/scripts/tsmerge.py b/cscripts/tsmerge.py
index 8372c5e..8372c5e 100644
--- a/scripts/tsmerge.py
+++ b/cscripts/tsmerge.py
diff --git a/test/Makefile.am b/test/Makefile.am
index 6207e4c..07b378a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,7 +8,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
 if WITH_PYTHON
   TEST_CSCRIPTS      = test_cscripts.sh
   TEST_PYTHON_SCRIPT = test_python.py
-  TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH)
+  TEST_PYTHON_ENV    = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(top_builddir)/cscripts:$(pythondir):$(pyexecdir):$(PYTHONPATH)
 endif
 
 # Set test environment
diff --git a/test/test_cscripts.sh.in b/test/test_cscripts.sh.in
index f1d0d8e..48bf410 100755
--- a/test/test_cscripts.sh.in
+++ b/test/test_cscripts.sh.in
@@ -52,8 +52,8 @@ export PFILES=pfiles
 # Test csobsdef
 # =============
 $ECHO -n "Test csobsdef: "
-chmod +x @abs_top_srcdir@/scripts/csobsdef.py
-@abs_top_srcdir@/scripts/csobsdef.py \
+chmod +x @abs_top_srcdir@/cscripts/csobsdef.py
+@abs_top_srcdir@/cscripts/csobsdef.py \
   inpnt="data/pntdef.dat" \
   outobs="obs.xml" \
   caldb="irf" \
@@ -77,8 +77,8 @@ $ECHO " ok"
 # Test cspull
 # ===========
 $ECHO -n "Test cspull: "
-chmod +x @abs_top_srcdir@/scripts/cspull.py
-@abs_top_srcdir@/scripts/cspull.py \
+chmod +x @abs_top_srcdir@/cscripts/cspull.py
+@abs_top_srcdir@/cscripts/cspull.py \
   inmodel="data/crab.xml" \
   outfile="pull.dat" \
   ntrials="3" \
@@ -110,8 +110,8 @@ $ECHO " ok"
 # Test cssens
 # ===========
 $ECHO -n "Test cssens: "
-chmod +x @abs_top_srcdir@/scripts/cssens.py
-@abs_top_srcdir@/scripts/cssens.py \
+chmod +x @abs_top_srcdir@/cscripts/cssens.py
+@abs_top_srcdir@/cscripts/cssens.py \
   inmodel="data/crab.xml" \
   srcname="Crab" \
   caldb="irf" \
@@ -136,8 +136,8 @@ $ECHO " ok"
 # Test cstsdist
 # =============
 $ECHO -n "Test cstsdist: "
-chmod +x @abs_top_srcdir@/scripts/cstsdist.py
-@abs_top_srcdir@/scripts/cstsdist.py \
+chmod +x @abs_top_srcdir@/cscripts/cstsdist.py
+@abs_top_srcdir@/cscripts/cstsdist.py \
   inmodel="data/crab.xml" \
   srcname="Crab" \
   outfile="ts.dat" \
@@ -168,8 +168,8 @@ $ECHO " ok"
 # Test csresmap
 # =============
 $ECHO -n "Test csresmap: "
-chmod +x @abs_top_srcdir@/scripts/csresmap.py
-@abs_top_srcdir@/scripts/csresmap.py \
+chmod +x @abs_top_srcdir@/cscripts/csresmap.py
+@abs_top_srcdir@/cscripts/csresmap.py \
   inobs="data/crab_events.fits" \
   outmap="resmap.fits" \
   inmodel="data/crab.xml" \
@@ -199,8 +199,8 @@ $ECHO " ok"
 # Test csspec (unbinned)
 # =====================
 $ECHO -n "Test csspec (unbinned): "
-chmod +x @abs_top_srcdir@/scripts/csspec.py
-@abs_top_srcdir@/scripts/csspec.py \
+chmod +x @abs_top_srcdir@/cscripts/csspec.py
+@abs_top_srcdir@/cscripts/csspec.py \
   inobs="data/crab_events.fits" \
   inmodel="data/crab.xml" \
   caldb="irf" \
@@ -226,8 +226,8 @@ $ECHO " ok"
 # Test csspec (binned)
 # ====================
 $ECHO -n "Test csspec (binned): "
-chmod +x @abs_top_srcdir@/scripts/csspec.py
-@abs_top_srcdir@/scripts/csspec.py \
+chmod +x @abs_top_srcdir@/cscripts/csspec.py
+@abs_top_srcdir@/cscripts/csspec.py \
   inobs="data/crab_events.fits" \
   inmodel="data/crab.xml" \
   caldb="irf" \
@@ -261,8 +261,8 @@ $ECHO " ok"
 # Test cslightcrv (unbinned)
 # ==========================
 $ECHO -n "Test cslightcrv (unbinned): "
-chmod +x @abs_top_srcdir@/scripts/cslightcrv.py
-@abs_top_srcdir@/scripts/cslightcrv.py \
+chmod +x @abs_top_srcdir@/cscripts/cslightcrv.py
+@abs_top_srcdir@/cscripts/cslightcrv.py \
   inobs="data/crab_events.fits" \
   inmodel="data/crab.xml" \
   srcname="Crab" \
@@ -291,8 +291,8 @@ $ECHO " ok"
 # Test cslightcrv (binned)
 # ========================
 $ECHO -n "Test cslightcrv (binned): "
-chmod +x @abs_top_srcdir@/scripts/cslightcrv.py
-@abs_top_srcdir@/scripts/cslightcrv.py \
+chmod +x @abs_top_srcdir@/cscripts/cslightcrv.py
+@abs_top_srcdir@/cscripts/cslightcrv.py \
   inobs="data/crab_events.fits" \
   inmodel="data/crab.xml" \
   srcname="Crab" \