diff --git a/.gitmodules b/.gitmodules
index 8bc48367b..962763718 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "ms-sbvar/utilities_dw"]
-	path = ms-sbvar/utilities_dw
+[submodule "contrib/ms-sbvar/utilities_dw"]
+	path = contrib/ms-sbvar/utilities_dw
 	url = http://www.dynare.org/git/frbatlanta/utilities_dw.git
-[submodule "ms-sbvar/switch_dw"]
-	path = ms-sbvar/switch_dw
+[submodule "contrib/ms-sbvar/switch_dw"]
+	path = contrib/ms-sbvar/switch_dw
 	url = http://www.dynare.org/git/frbatlanta/switch_dw.git
diff --git a/ms-sbvar/Makefile b/contrib/ms-sbvar/Makefile
similarity index 100%
rename from ms-sbvar/Makefile
rename to contrib/ms-sbvar/Makefile
diff --git a/ms-sbvar/make_libraries_master b/contrib/ms-sbvar/make_libraries_master
similarity index 100%
rename from ms-sbvar/make_libraries_master
rename to contrib/ms-sbvar/make_libraries_master
diff --git a/ms-sbvar/make_machines_master b/contrib/ms-sbvar/make_machines_master
similarity index 100%
rename from ms-sbvar/make_machines_master
rename to contrib/ms-sbvar/make_machines_master
diff --git a/ms-sbvar/switch_dw b/contrib/ms-sbvar/switch_dw
similarity index 100%
rename from ms-sbvar/switch_dw
rename to contrib/ms-sbvar/switch_dw
diff --git a/ms-sbvar/utilities_dw b/contrib/ms-sbvar/utilities_dw
similarity index 100%
rename from ms-sbvar/utilities_dw
rename to contrib/ms-sbvar/utilities_dw
diff --git a/license.txt b/license.txt
index 4cfe80db5..d7ba91e07 100644
--- a/license.txt
+++ b/license.txt
@@ -138,15 +138,15 @@ Copyright: 2009 John Burkardt
            2010-2011 Dynare Team
 License: LGPL-3+
 
-Files: ms-sbvar/utilities_dw/*
+Files: contrib/ms-sbvar/utilities_dw/*
 Copyright: 1996-2011 Daniel Waggoner
 License: GPL-3+
 
-Files: ms-sbvar/switch_dw/*
+Files: contrib/ms-sbvar/switch_dw/*
 Copyright: 1996-2011 Daniel Waggoner and Tao Zha
 License: GPL-3+
 
-Files: ms-sbvar/switch_dw/state_space/sbvar/dw_csminwel.c
+Files: contrib/ms-sbvar/switch_dw/state_space/sbvar/dw_csminwel.c
  state_space/sbvar/dw_csminwel.h
 Copyright: 1996 Christopher Sims
            2003 Karibzhanov, Waggoner and Zha
diff --git a/mex/build/ms_sbvar.am b/mex/build/ms_sbvar.am
index ce1d4584f..f39bca218 100644
--- a/mex/build/ms_sbvar.am
+++ b/mex/build/ms_sbvar.am
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = ms_sbvar_create_init_file ms_sbvar_command_line
 
-DWSWITCHDIR = $(top_srcdir)/../../../ms-sbvar/switch_dw
-DWUTILITIESDIR = $(top_srcdir)/../../../ms-sbvar/utilities_dw
+DWSWITCHDIR = $(top_srcdir)/../../../contrib/ms-sbvar/switch_dw
+DWUTILITIESDIR = $(top_srcdir)/../../../contrib/ms-sbvar/utilities_dw
 
 DYNMEXSRCDIR = $(top_srcdir)/../../sources
 MSMEXSRCDIR = $(DYNMEXSRCDIR)/ms-sbvar