diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 98830509bd7..6743d415ff1 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -157,7 +157,7 @@ class modOpenSurvey extends DolibarrModules
 								'titre'=>'NewSurvey',
 								'mainmenu'=>'opensurvey',
 								'leftmenu'=>'opensurvey_new',
-								'url'=>'/opensurvey/public/index.php',
+								'url'=>'/opensurvey/wizard/index.php',
 								'langs'=>'opensurvey',
 								'position'=>210,
                 				'enabled'=>'$conf->opensurvey->enabled',         // Define condition to show or hide menu entry. Use '$conf->NewsSubmitter->enabled' if entry must be visible if module is enabled.
diff --git a/htdocs/opensurvey/public/images/date.png b/htdocs/opensurvey/img/date.png
similarity index 100%
rename from htdocs/opensurvey/public/images/date.png
rename to htdocs/opensurvey/img/date.png
diff --git a/htdocs/opensurvey/public/images/sondage2.png b/htdocs/opensurvey/img/sondage2.png
similarity index 100%
rename from htdocs/opensurvey/public/images/sondage2.png
rename to htdocs/opensurvey/img/sondage2.png
diff --git a/htdocs/opensurvey/public/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
similarity index 96%
rename from htdocs/opensurvey/public/choix_autre.php
rename to htdocs/opensurvey/wizard/choix_autre.php
index 41467471340..aec26c5ca48 100644
--- a/htdocs/opensurvey/public/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/opensurvey/public/choix_autre.php
+ *	\file       htdocs/opensurvey/wizard/choix_autre.php
  *	\ingroup    opensurvey
  *	\brief      Page to create a new survey (choice selection)
  */
@@ -139,12 +139,12 @@ print '</table>'."\n";
 
 //ajout de cases supplementaires
 print '<table><tr>'."\n";
-print '<td>'. $langs->trans("5MoreChoices") .'</td><td><input type="image" name="ajoutcases" value="Retour" src="images/add-16.png"></td>'."\n";
+print '<td>'. $langs->trans("5MoreChoices") .'</td><td><input type="image" name="ajoutcases" value="Retour" src="../img/add-16.png"></td>'."\n";
 print '</tr></table>'."\n";
 print'<br>'."\n";
 
 print '<table><tr>'."\n";
-print '<td></td><td><input type="submit" class="button" name="confirmecreation" value="'.dol_escape_htmltag($langs->trans("CreatePoll")).'" src="images/next-32.png"></td>'."\n";
+print '<td></td><td><input type="submit" class="button" name="confirmecreation" value="'.dol_escape_htmltag($langs->trans("CreatePoll")).'" src="../img/next-32.png"></td>'."\n";
 print '</tr></table>'."\n";
 
 //fin du formulaire et bandeau de pied
diff --git a/htdocs/opensurvey/public/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
similarity index 98%
rename from htdocs/opensurvey/public/choix_date.php
rename to htdocs/opensurvey/wizard/choix_date.php
index 7a67c313739..606b1ecf873 100644
--- a/htdocs/opensurvey/public/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/opensurvey/public/choix_date.php
+ *	\file       htdocs/opensurvey/wizard/choix_date.php
  *	\ingroup    opensurvey
  *	\brief      Page to create a new survey (date selection)
  */
@@ -320,7 +320,7 @@ else
 
 
 //Debut du formulaire et bandeaux de tete
-print '<form name="formulaire" action="choix_date.php" method="POST">'."\n";
+print '<form name="formulaire" action="" method="POST">'."\n";
 
 print_fiche_titre($langs->trans("CreatePoll").' (2 / 2)');
 
@@ -332,11 +332,11 @@ print '</div>'."\n";
 //debut du tableau qui affiche le calendrier
 print '<center><div class="corps">'."\n";
 print '<table align=center>'."\n";
-print '<tr><td><input type="image" name="anneeavant" value="<<" src="images/rewind.png"></td><td><input type="image" name="moisavant" value="<" src="images/previous.png"></td>';
+print '<tr><td><input type="image" name="anneeavant" value="<<" src="../img/rewind.png"></td><td><input type="image" name="moisavant" value="<" src="../img/previous.png"></td>';
 print '<td width="150px" align="center"> '.$motmois.' '.$_SESSION["annee"].'<br>';
 print '<input type="image" name="retourmois" alt="'.dol_escape_htmltag($langs->trans("BackToCurrentMonth")).'" title="'.dol_escape_htmltag($langs->trans("BackToCurrentMonth")).'" value="" src="'.img_picto('', 'refresh','',0,1).'">';
-print '</td><td><input type="image" name="moisapres" value=">" src="images/next.png"></td>';
-print '<td><input type="image" name="anneeapres" value=">>" src="images/fforward.png"></td><td></td><td></td><td></td><td></td><td></td><td>';
+print '</td><td><input type="image" name="moisapres" value=">" src="../img/next.png"></td>';
+print '<td><input type="image" name="anneeapres" value=">>" src="../img/fforward.png"></td><td></td><td></td><td></td><td></td><td></td><td>';
 print '</td></tr>'."\n";
 print '</table>'."\n";
 print '<table>'."\n";
@@ -503,7 +503,7 @@ if (issetAndNoEmpty('totalchoixjour', $_SESSION) || $erreur)
 	}
 
 	if ($_SESSION["nbrecaseshoraires"] < 10) {
-		print '<td classe="somme"><input type="image" name="ajoutcases" src="images/add-16.png"></td>'."\n";
+		print '<td classe="somme"><input type="image" name="ajoutcases" src="../img/add-16.png"></td>'."\n";
 	}
 
 	print '</tr>'."\n";
diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
similarity index 96%
rename from htdocs/opensurvey/public/create_survey.php
rename to htdocs/opensurvey/wizard/create_survey.php
index 43d77593313..cad66b34d4a 100644
--- a/htdocs/opensurvey/public/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file       htdocs/opensurvey/public/create_survey.php
+ *	\file       htdocs/opensurvey/wizard/create_survey.php
  *	\ingroup    opensurvey
  *	\brief      Page to create a new survey
  */
@@ -133,7 +133,7 @@ llxHeader('', $langs->trans("OpenSurvey"), '', "", 0, 0, $arrayofjs, $arrayofcss
 print_fiche_titre($langs->trans("CreatePoll").' (1 / 2)');
 
 //debut du formulaire
-print '<form name="formulaire" action="create_survey.php" method="POST">'."\n";
+print '<form name="formulaire" action="" method="POST">'."\n";
 
 //Affichage des différents champs textes a remplir
 print '<table class="border" width="100%">'."\n";
@@ -217,9 +217,9 @@ else
 	//affichage des boutons pour choisir sondage date ou autre
 	print '<br><table>'."\n";
 	print '<tr><td>'. $langs->trans("CreateSurveyDate") .'</td><td></td> '."\n";
-	print '<td><input type="image" name="creation_sondage_date" value="'.$langs->trans('CreateSurveyDate').'" src="images/calendar-32.png"></td></tr>'."\n";
+	print '<td><input type="image" name="creation_sondage_date" value="'.$langs->trans('CreateSurveyDate').'" src="../img/calendar-32.png"></td></tr>'."\n";
 	print '<tr><td>'. $langs->trans("CreateSurveyStandard") .'</td><td></td> '."\n";
-	print '<td><input type="image" name="creation_sondage_autre" value="'.$langs->trans('CreateSurveyStandard').'" src="images/chart-32.png"></td></tr>'."\n";
+	print '<td><input type="image" name="creation_sondage_autre" value="'.$langs->trans('CreateSurveyStandard').'" src="../img/chart-32.png"></td></tr>'."\n";
 	print '</table>'."\n";
 }
 print '<br><br><br>'."\n";
diff --git a/htdocs/opensurvey/public/index.php b/htdocs/opensurvey/wizard/index.php
similarity index 90%
rename from htdocs/opensurvey/public/index.php
rename to htdocs/opensurvey/wizard/index.php
index f070a2f6f12..6bb6403ff72 100644
--- a/htdocs/opensurvey/public/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -46,8 +46,8 @@ print '<center>
 print '<p>'.$langs->trans("OrganizeYourMeetingEasily").'</p>
 <div class="corps">
 <br>
-<div class="index_date"><div><img class="opacity" src="images/date.png" onclick="document.formulaire.date.click()"></div><button id="date" name="choix_sondage" value="date" type="submit" class="button orange bigrounded"><img src="images/calendar-32.png" alt="'.dol_escape_htmltag($langs->trans("CreateSurveyDate")).'"><strong>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyDate")).'</strong></button></div>
-<div class="index_sondage"><div><img class="opacity" src="images/sondage2.png" onclick="document.formulaire.autre.click()"></div><button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded"><img src="images/chart-32.png" alt="'.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'"><strong>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'</strong></button></div><div style="clear:both;"></div>
+<div class="index_date"><div><img class="opacity" src="../img/date.png" onclick="document.formulaire.date.click()"></div><button id="date" name="choix_sondage" value="date" type="submit" class="button orange bigrounded"><img src="../img/calendar-32.png" alt="'.dol_escape_htmltag($langs->trans("CreateSurveyDate")).'"><strong>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyDate")).'</strong></button></div>
+<div class="index_sondage"><div><img class="opacity" src="../img/sondage2.png" onclick="document.formulaire.autre.click()"></div><button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded"><img src="../img/chart-32.png" alt="'.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'"><strong>&nbsp;'.dol_escape_htmltag($langs->trans("CreateSurveyStandard")).'</strong></button></div><div style="clear:both;"></div>
 </div>
 </form></center>';