diff --git a/sass/_07-flexbox.scss b/less/_02-layout.less
similarity index 68%
rename from sass/_07-flexbox.scss
rename to less/_02-layout.less
index dead3ad..dca68b7 100644
--- a/sass/_07-flexbox.scss
+++ b/less/_02-layout.less
@@ -1,5 +1,7 @@
-/* flexbox layout 
-Tutorial: http://knacss.com/demos/tutoriel.html#flex */
+/* flexbox layout
+http://www.alsacreations.com/tuto/lire/1493-css3-flexbox-layout-module.html
+*/
+
 .flex {
 	display : flex;
 }
diff --git a/less/_02-helpers.less b/less/_06-helpers.less
similarity index 100%
rename from less/_02-helpers.less
rename to less/_06-helpers.less
diff --git a/less/_06-icons.less b/less/_06-icons.less
deleted file mode 100644
index f229c9d..0000000
--- a/less/_06-icons.less
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ----------------------------- */
-/* ==icons and bullets	         */
-/* ----------------------------- */
-
-.icon {display: inline-block;}
-
-.icon:before,
-.icon.after:after {
-	content: "";
-	display: inline-block;
-	vertical-align: middle;
-	position: relative; top: -0.1em;
-	margin: 0 0.3em 0 0;
-	font: 1.4em/1 sans-serif;
-	color: #000;
-	text-shadow: 1px 1px 0 rgba(0,0,0,.1);
-	speak: none;
-}
-
-@media (min-device-width: @small-screen) {
-	.icon:before,
-	.icon.after:after {
-		font: 1em/0.6 sans-serif;
-		-webkit-transform: rotateZ(0.05deg);
-	}
-}
-
-.icon.after:after {
-	margin: 0 0 0 8px;
-}
-
-.icon.after:before {
-	content: "" !important;
-}
-
-.icon-rate:before,
-.icon-rate.after:after {
-	content: "\2605";
-}
-
-.icon-unrate:before,
-.icon-unrate.after:after{
-	content: "\2606";
-}
-
-.icon-check:before,
-.icon-check.after:after{
-	content: "\2713";
-}
-
-.icon-uncheck:before,
-.icon-uncheck.after:after{
-	content: "\2717";
-}
-
-.icon-cloud:before,
-.icon-cloud.after:after {
-	content: "\2601";
-}
-
-.icon-dl:before,
-.icon-dl.after:after {
-	content: "\21E3";
-	font-weight: bold;
-}
-
-.icon-cross:before,
-.icon-cross.after:after {
-	content: "\2716";
-	font-weight: bold;
-}
-
-.icon-arrow1:before,
-.icon-arrow1.after:after {
-	content: "\2192";
-	position: relative;
-		top: -0.15em;
-}
-
-.icon-arrow2:before,
-.icon-arrow2.after:after {
-	content: "\279E";
-}
-
-.icon-arrow3:before,
-.icon-arrow3.after:after {
-	content: "\279A";
-}
-
-.icon-bracket1:before,
-.icon-bracket1.after:after {
-	content: "\2039";
-	font-weight: bold;
-	font-size: 1.6em;
-	position: relative;
-		top: -0.15em;
-}
-
-.icon-bracket2:before,
-.icon-bracket2.after:after {
-	content: "\203A";
-	font-weight: bold;
-	font-size: 1.6em;
-	position: relative;
-		top: -0.15em;
-}
-
-.icon-up:before,
-.icon-up.after:after {
-	content: "\25B2";
-}
-
-.icon-down:before,
-.icon-down.after:after {
-	content: "\25BC";
-}
-
-.icon-bull:before,
-.icon-bull.after:after {
-	content: "\2022";
-	font-size: 1.2em;
-	top: -0.05em;
-}
-
-.icon-bull2:before,
-.icon-bull2.after:after {
-	content: "\25E6";
-	top: -0.05em;
-}
-
-.icon-bull3:before,
-.icon-bull3.after:after{
-	content: "\2023";
-	font-size: 1.6em;
-	top: -0.05em;
-}
-
-.icon-nav:before,
-.icon-nav.after:after {
-	content: "\2261";
-	font-weight: bold;
-}
-
-.icon-losange:before,
-.icon-losange.after:after {
-	content: "\25C6";
-}
-
-.icon-asteri:before,
-.icon-asteri.after:after {
-	content: "\2731";
-	font-weight: bold;
-}
-
-.icon-mail:before,
-.icon-mail.after:after {
-	content: "\2709";
-	font-size: 1.6em;
-	top: -.05em;
-}
diff --git a/less/_08-rwd.less b/less/_07-responsive.less
similarity index 100%
rename from less/_08-rwd.less
rename to less/_07-responsive.less
diff --git a/less/_09-print.less b/less/_08-print.less
similarity index 100%
rename from less/_09-print.less
rename to less/_08-print.less
diff --git a/less/_10-misc.less b/less/_09-misc.less
similarity index 100%
rename from less/_10-misc.less
rename to less/_09-misc.less
diff --git a/less/_11-styling.less b/less/_10-styling.less
similarity index 100%
rename from less/_11-styling.less
rename to less/_10-styling.less
diff --git a/less/knacss.less b/less/knacss.less
index 2df9903..c920411 100644
--- a/less/knacss.less
+++ b/less/knacss.less
@@ -1,22 +1,22 @@
 // LESS config file
-// (you should comment this line and move config file from vendor/knacss folder to your own folder)
+// -----------------
+
+// (WARNING : you should comment this line and move config file from vendor/knacss folder to your own folder)
 @import "_00-config";
 
 // LESS base styles
-@import "_01-base"; // reset, config and basic layout
+@import "_01-base"; // reset and basic styles
 
 // LESS files : chose the ones you need
-@import "_02-helpers"; // width and spacers visually classes
-@import "_03-grids"; // grids and autogrids
-@import "_04-tables";
-@import "_05-forms";
-@import "_06-icons"; // UTF-8 icons
-@import "_07-flexbox";
-@import "_08-rwd"; // Responsive Web Design helpers
-@import "_09-print";
-@import "_10-booleans"; // skip links and hyphens
-@import "_11-gmaps"; // Google maps bugs fix
-@import "_13-styling"; // minor stylings
+@import "_02-layout"; // alignment, modules, positionning
+@import "_03-grids"; // grids
+@import "_04-tables"; // data tables consistency
+@import "_05-forms"; // forms consistency
+@import "_06-helpers"; // width and spacers visually classes
+@import "_07-responsive"; // Responsive Web Design helpers
+@import "_08-print"; // print quick reset
+@import "_09-misc"; // skip links, google maps and hyphens
+@import "_10-styling"; // minor stylings
 
 /* ----------------------------- */
 /* ==own stylesheet              */
diff --git a/less/_07-flexbox.less b/sass/_02-layout.scss
similarity index 100%
rename from less/_07-flexbox.less
rename to sass/_02-layout.scss
diff --git a/sass/_02-helpers.scss b/sass/_06-helpers.scss
similarity index 100%
rename from sass/_02-helpers.scss
rename to sass/_06-helpers.scss
diff --git a/sass/_06-icons.scss b/sass/_06-icons.scss
deleted file mode 100644
index 4d2cc41..0000000
--- a/sass/_06-icons.scss
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ----------------------------- */
-/* ==icons and bullets	         */
-/* ----------------------------- */
-
-.icon {display: inline-block;}
-
-.icon:before,
-.icon.after:after {
-	content: "";
-	display: inline-block;
-	vertical-align: middle;
-	position: relative; top: -0.1em;
-	margin: 0 0.3em 0 0;
-	font: 1.4em/1 sans-serif;
-	color: #000;
-	text-shadow: 1px 1px 0 rgba(0,0,0,.1);
-	speak: none;
-}
-
-@media (min-device-width: $small-screen) {
-	.icon:before,
-	.icon.after:after {
-	font: 1em/0.6 sans-serif;
-	-webkit-transform: rotateZ(0.05deg);
-	}
-}
-
-.icon.after:after {
-	margin: 0 0 0 8px;
-}
-
-.icon.after:before {
-	content: "" !important
-}
-
-.icon-rate:before,
-.icon-rate.after:after {
-	content: "\2605";
-}
-.icon-unrate:before,
-.icon-unrate.after:after{
-	content: "\2606";
-}
-
-.icon-check:before,
-.icon-check.after:after{
-	content: "\2713";
-}
-
-.icon-uncheck:before,
-.icon-uncheck.after:after{
-	content: "\2717";
-}
-
-.icon-cloud:before,
-.icon-cloud.after:after {
-	content: "\2601";
-}
-
-.icon-dl:before,
-.icon-dl.after:after {
-	content: "\21E3";
-	font-weight: bold;
-}
-
-.icon-cross:before,
-.icon-cross.after:after {
-	content: "\2716";
-	font-weight: bold;
-}
-
-.icon-arrow1:before,
-.icon-arrow1.after:after {
-	content: "\2192";
-	position: relative;
-		top: -0.15em;
-}
-
-.icon-arrow2:before,
-.icon-arrow2.after:after {
-	content: "\279E";
-}
-
-.icon-arrow3:before,
-.icon-arrow3.after:after {
-	content: "\279A";
-}
-
-.icon-bracket1:before,
-.icon-bracket1.after:after {
-	content: "\2039";
-	font-weight: bold;
-	font-size: 1.6em;
-	position: relative;
-		top: -0.15em;
-}
-
-.icon-bracket2:before,
-.icon-bracket2.after:after {
-	content: "\203A";
-	font-weight: bold;
-	font-size: 1.6em;
-	position: relative;
-		top: -0.15em;
-}
-
-.icon-up:before,
-.icon-up.after:after {
-	content: "\25B2";
-}
-
-.icon-down:before,
-.icon-down.after:after {
-	content: "\25BC";
-}
-
-.icon-bull:before,
-.icon-bull.after:after {
-	content: "\2022";
-	font-size: 1.2em;
-	top: -0.05em;
-}
-
-.icon-bull2:before,
-.icon-bull2.after:after {
-	content: "\25E6";
-	top: -0.05em;
-}
-
-.icon-bull3:before,
-.icon-bull3.after:after{
-	content: "\2023";
-	font-size: 1.6em;
-	top: -0.05em;
-}
-
-.icon-nav:before,
-.icon-nav.after:after {
-	content: "\2261";
-	font-weight: bold;
-}
-
-.icon-losange:before,
-.icon-losange.after:after {
-	content: "\25C6";
-}
-
-.icon-asteri:before,
-.icon-asteri.after:after {
-	content: "\2731";
-	font-weight: bold;
-}
-
-.icon-mail:before,
-.icon-mail.after:after {
-	content: "\2709";
-	font-size: 1.6em;
-	top: -.05em;
-}
diff --git a/sass/_08-rwd.scss b/sass/_07-responsive.scss
similarity index 100%
rename from sass/_08-rwd.scss
rename to sass/_07-responsive.scss
diff --git a/sass/_09-print.scss b/sass/_08-print.scss
similarity index 100%
rename from sass/_09-print.scss
rename to sass/_08-print.scss
diff --git a/sass/_10-misc.scss b/sass/_09-misc.scss
similarity index 100%
rename from sass/_10-misc.scss
rename to sass/_09-misc.scss
diff --git a/sass/_11-styling.scss b/sass/_10-styling.scss
similarity index 100%
rename from sass/_11-styling.scss
rename to sass/_10-styling.scss
diff --git a/sass/knacss.scss b/sass/knacss.scss
index a0e3721..b414c59 100644
--- a/sass/knacss.scss
+++ b/sass/knacss.scss
@@ -1,22 +1,22 @@
 // Sass config file
-// (you should comment this line and move config file from vendor/knacss folder to your own folder)
+// -----------------
+
+// (WARNING : you should comment this line and move config file from vendor/knacss folder to your own folder)
 @import "_00-config";
 
 // Sass base styles
-@import "_01-base";
+@import "_01-base"; // reset and basic styles
 
 // Sass files : chose the ones you need
-@import "_02-helpers"; // width and spacers visually classes
-@import "_03-grids"; // grids and autogrids
-@import "_04-tables";
-@import "_05-forms";
-@import "_06-icons"; // UTF-8 icons
-@import "_07-flexbox";
-@import "_08-rwd"; // Responsive Web Design helpers
-@import "_09-print";
-@import "_10-booleans"; // skip links and hyphens
-@import "_11-gmaps"; // Google maps bugs fix
-@import "_13-styling"; // minor stylings
+@import "_02-layout"; // alignment, modules, positionning
+@import "_03-grids"; // grids
+@import "_04-tables"; // data tables consistency
+@import "_05-forms"; // forms consistency
+@import "_06-helpers"; // width and spacers visually classes
+@import "_07-responsive"; // Responsive Web Design helpers
+@import "_08-print"; // print quick reset
+@import "_09-misc"; // skip links, google maps and hyphens
+@import "_10-styling"; // minor stylings
 
 /* ----------------------------- */
 /* ==own stylesheet              */