diff --git a/.travis.yml b/.travis.yml
index ffb2690f05b5c2f0b9cf4f8dda76514811df91cf..fa2a9e0225bf5ba4ddc87f8bca328de06cf61e5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,30 +26,30 @@ matrix:
 install:
 # build the manual, only if log contains string [makedoc]
   - export PLUMED_NUM_THREADS=2
-  - ./.travis.check.log makedoc  || MAKEDOC=no
-  - ./.travis.check.log valgrind || VALGRIND=no
-  - ./.travis.check.log almost   || ALMOST=no
+  - ./.travis/check.log makedoc  || MAKEDOC=no
+  - ./.travis/check.log valgrind || VALGRIND=no
+  - ./.travis/check.log almost   || ALMOST=no
 # install some package - these are fast, we install them anyway
   - sudo apt-get update -qq
   - sudo apt-get install -y libmatheval-dev
-  - ./.travis.install.xdrfile
+  - ./.travis/install.xdrfile
   - LIBRARY_PATH="$LIBRARY_PATH:/usr/local/lib"
   - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
 # cppcheck:
-  - test "$CPPCHECK" == yes && ./.travis.install.cppcheck 1.69 || true
+  - test "$CPPCHECK" == yes && ./.travis/install.cppcheck 1.69 || true
 # installation of these packages takes a lot of time
 # we do it only when needed
   - test "$PLUMED_CXX" == "mpic++" && sudo apt-get install -y libopenmpi1.5-dev openmpi1.5-bin || true
   - test "$MAKEDOC" == yes && sudo apt-get install -y graphviz            || true
 # doxygen from its repository (apt-get gets an old version)
-#  - test "$MAKEDOC" == yes && ./.travis.install.doxygen                   || true
+#  - test "$MAKEDOC" == yes && ./.travis/install.doxygen                   || true
 # it seems that here we can get precompiled doxygen and latex
   - test "$MAKEDOC" == yes && sudo apt-add-repository -y ppa:libreoffice/ppa || true
   - test "$MAKEDOC" == yes && sudo apt-get update -qq                     || true
   - test "$MAKEDOC" == yes && sudo apt-get install -y doxygen doxygen-latex || true
   - test "$VALGRIND" == yes && sudo apt-get install -y valgrind           || true
   - test "$LAPACK" == yes  && sudo apt-get install libatlas-base-dev      || true
-  - test "$ALMOST" == yes && ./.travis.install.almost                     || true
+  - test "$ALMOST" == yes && ./.travis/install.almost                     || true
   - test "$ALMOST" == yes && ENALMOST="--enable-almost"                 || true
   - test "$ALMOST" == yes && PLUMED_CPPFLAGS="$INCLUDE -I/usr/local/include -I/usr/local/include/almost"  || true
 # moreover, we hardcode path to dynamic library, required for xdrfile to link properly
@@ -71,4 +71,4 @@ script:
   - make -C regtest checkfail
   - if test "$CPPCHECK" == yes ; then make cppcheck ; fi
 after_success:
-  - test "$MAKEDOC" == yes && ./.travis.pushdoc
+  - test "$MAKEDOC" == yes && ./.travis/pushdoc
diff --git a/.travis.check.log b/.travis/check.log
similarity index 100%
rename from .travis.check.log
rename to .travis/check.log
diff --git a/.travis.install.almost b/.travis/install.almost
similarity index 100%
rename from .travis.install.almost
rename to .travis/install.almost
diff --git a/.travis.install.cppcheck b/.travis/install.cppcheck
similarity index 100%
rename from .travis.install.cppcheck
rename to .travis/install.cppcheck
diff --git a/.travis.install.doxygen b/.travis/install.doxygen
similarity index 100%
rename from .travis.install.doxygen
rename to .travis/install.doxygen
diff --git a/.travis.install.xdrfile b/.travis/install.xdrfile
similarity index 100%
rename from .travis.install.xdrfile
rename to .travis/install.xdrfile
diff --git a/.travis.pushdoc b/.travis/pushdoc
similarity index 100%
rename from .travis.pushdoc
rename to .travis/pushdoc