diff --git a/3-more/8-regular-expressions-javascript/1-regexp-introduction/article.md b/10-regular-expressions-javascript/1-regexp-introduction/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/1-regexp-introduction/article.md rename to 10-regular-expressions-javascript/1-regexp-introduction/article.md diff --git a/3-more/8-regular-expressions-javascript/10-regexp-backreferences/article.md b/10-regular-expressions-javascript/10-regexp-backreferences/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/10-regexp-backreferences/article.md rename to 10-regular-expressions-javascript/10-regexp-backreferences/article.md diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/article.md b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/article.md rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/article.md diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy1.png b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy1.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy1.png rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy1.png diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy11.png b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy11.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy11.png rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy11.png diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy2.png b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy2.png rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy2.png diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy3.png b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy3.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy3.png rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy3.png diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy4.png b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy4.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy4.png rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy4.png diff --git a/3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy5.png b/10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy5.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy5.png rename to 10-regular-expressions-javascript/11-regexp-infinite-backtracking-problem/bad_backtrack_greedy5.png diff --git a/3-more/8-regular-expressions-javascript/12-regexp-alternation/article.md b/10-regular-expressions-javascript/12-regexp-alternation/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/12-regexp-alternation/article.md rename to 10-regular-expressions-javascript/12-regexp-alternation/article.md diff --git a/3-more/8-regular-expressions-javascript/13-regexp-ahchors-and-multiline-mode/article.md b/10-regular-expressions-javascript/13-regexp-ahchors-and-multiline-mode/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/13-regexp-ahchors-and-multiline-mode/article.md rename to 10-regular-expressions-javascript/13-regexp-ahchors-and-multiline-mode/article.md diff --git a/3-more/8-regular-expressions-javascript/14-regexp-multiline-mode/article.md b/10-regular-expressions-javascript/14-regexp-multiline-mode/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/14-regexp-multiline-mode/article.md rename to 10-regular-expressions-javascript/14-regexp-multiline-mode/article.md diff --git a/3-more/8-regular-expressions-javascript/15-regexp-word-boundary/article.md b/10-regular-expressions-javascript/15-regexp-word-boundary/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/15-regexp-word-boundary/article.md rename to 10-regular-expressions-javascript/15-regexp-word-boundary/article.md diff --git a/3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary1.png b/10-regular-expressions-javascript/15-regexp-word-boundary/boundary1.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary1.png rename to 10-regular-expressions-javascript/15-regexp-word-boundary/boundary1.png diff --git a/3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary2.png b/10-regular-expressions-javascript/15-regexp-word-boundary/boundary2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary2.png rename to 10-regular-expressions-javascript/15-regexp-word-boundary/boundary2.png diff --git a/3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary3.png b/10-regular-expressions-javascript/15-regexp-word-boundary/boundary3.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary3.png rename to 10-regular-expressions-javascript/15-regexp-word-boundary/boundary3.png diff --git a/3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary4.png b/10-regular-expressions-javascript/15-regexp-word-boundary/boundary4.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/15-regexp-word-boundary/boundary4.png rename to 10-regular-expressions-javascript/15-regexp-word-boundary/boundary4.png diff --git a/3-more/8-regular-expressions-javascript/16-regexp-practice/article.md b/10-regular-expressions-javascript/16-regexp-practice/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/16-regexp-practice/article.md rename to 10-regular-expressions-javascript/16-regexp-practice/article.md diff --git a/3-more/8-regular-expressions-javascript/17-regexp-orphans/article.md b/10-regular-expressions-javascript/17-regexp-orphans/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/17-regexp-orphans/article.md rename to 10-regular-expressions-javascript/17-regexp-orphans/article.md diff --git a/3-more/8-regular-expressions-javascript/2-regexp-methods/article.md b/10-regular-expressions-javascript/2-regexp-methods/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/2-regexp-methods/article.md rename to 10-regular-expressions-javascript/2-regexp-methods/article.md diff --git a/3-more/8-regular-expressions-javascript/3-regexp-character-classes/article.md b/10-regular-expressions-javascript/3-regexp-character-classes/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/3-regexp-character-classes/article.md rename to 10-regular-expressions-javascript/3-regexp-character-classes/article.md diff --git a/3-more/8-regular-expressions-javascript/3-regexp-character-classes/love_html5.png b/10-regular-expressions-javascript/3-regexp-character-classes/love_html5.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/3-regexp-character-classes/love_html5.png rename to 10-regular-expressions-javascript/3-regexp-character-classes/love_html5.png diff --git a/3-more/8-regular-expressions-javascript/4-regexp-special-characters/article.md b/10-regular-expressions-javascript/4-regexp-special-characters/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/4-regexp-special-characters/article.md rename to 10-regular-expressions-javascript/4-regexp-special-characters/article.md diff --git a/3-more/8-regular-expressions-javascript/5-regexp-character-sets-and-ranges/article.md b/10-regular-expressions-javascript/5-regexp-character-sets-and-ranges/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/5-regexp-character-sets-and-ranges/article.md rename to 10-regular-expressions-javascript/5-regexp-character-sets-and-ranges/article.md diff --git a/3-more/8-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/solution.md b/10-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/solution.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/solution.md rename to 10-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/solution.md diff --git a/3-more/8-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/task.md b/10-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/task.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/task.md rename to 10-regular-expressions-javascript/6-regexp-numeric-quantifiers/1-find-text-manydots/task.md diff --git a/3-more/8-regular-expressions-javascript/6-regexp-numeric-quantifiers/article.md b/10-regular-expressions-javascript/6-regexp-numeric-quantifiers/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/6-regexp-numeric-quantifiers/article.md rename to 10-regular-expressions-javascript/6-regexp-numeric-quantifiers/article.md diff --git a/3-more/8-regular-expressions-javascript/7-regexp-quantifiers/article.md b/10-regular-expressions-javascript/7-regexp-quantifiers/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/7-regexp-quantifiers/article.md rename to 10-regular-expressions-javascript/7-regexp-quantifiers/article.md diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/article.md b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/article.md rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/article.md diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy1.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy1.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy1.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy1.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy2.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy2.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy2.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy3.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy3.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy3.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy3.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy4.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy4.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy4.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy4.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy5.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy5.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy5.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy5.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy6.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy6.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy6.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_greedy6.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy3.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy3.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy3.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy3.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy4.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy4.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy4.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy4.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy5.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy5.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy5.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy5.png diff --git a/3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy6.png b/10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy6.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy6.png rename to 10-regular-expressions-javascript/8-regexp-greedy-and-lazy/witch_lazy6.png diff --git a/3-more/8-regular-expressions-javascript/9-regexp-groups/article.md b/10-regular-expressions-javascript/9-regexp-groups/article.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/9-regexp-groups/article.md rename to 10-regular-expressions-javascript/9-regexp-groups/article.md diff --git a/3-more/8-regular-expressions-javascript/9-regexp-groups/groups.png b/10-regular-expressions-javascript/9-regexp-groups/groups.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/8-regular-expressions-javascript/9-regexp-groups/groups.png rename to 10-regular-expressions-javascript/9-regexp-groups/groups.png diff --git a/3-more/8-regular-expressions-javascript/index.md b/10-regular-expressions-javascript/index.md similarity index 100% rename from 3-more/8-regular-expressions-javascript/index.md rename to 10-regular-expressions-javascript/index.md diff --git a/3-more/9-tools/1-tools-browser-extensions/article.md b/11-tools/1-tools-browser-extensions/article.md similarity index 100% rename from 3-more/9-tools/1-tools-browser-extensions/article.md rename to 11-tools/1-tools-browser-extensions/article.md diff --git a/3-more/9-tools/1-tools-browser-extensions/dnsflusher.png b/11-tools/1-tools-browser-extensions/dnsflusher.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/1-tools-browser-extensions/dnsflusher.png rename to 11-tools/1-tools-browser-extensions/dnsflusher.png diff --git a/3-more/9-tools/1-tools-browser-extensions/downloadhelper.jpg b/11-tools/1-tools-browser-extensions/downloadhelper.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/1-tools-browser-extensions/downloadhelper.jpg rename to 11-tools/1-tools-browser-extensions/downloadhelper.jpg diff --git a/3-more/9-tools/1-tools-browser-extensions/jsonview.png b/11-tools/1-tools-browser-extensions/jsonview.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/1-tools-browser-extensions/jsonview.png rename to 11-tools/1-tools-browser-extensions/jsonview.png diff --git a/3-more/9-tools/1-tools-browser-extensions/pageinsight.png b/11-tools/1-tools-browser-extensions/pageinsight.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/1-tools-browser-extensions/pageinsight.png rename to 11-tools/1-tools-browser-extensions/pageinsight.png diff --git a/3-more/9-tools/1-tools-browser-extensions/webdeveloper.png b/11-tools/1-tools-browser-extensions/webdeveloper.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/1-tools-browser-extensions/webdeveloper.png rename to 11-tools/1-tools-browser-extensions/webdeveloper.png diff --git a/3-more/9-tools/2-fiddler/article.md b/11-tools/2-fiddler/article.md similarity index 100% rename from 3-more/9-tools/2-fiddler/article.md rename to 11-tools/2-fiddler/article.md diff --git a/3-more/9-tools/2-fiddler/fiddler-hook.png b/11-tools/2-fiddler/fiddler-hook.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/2-fiddler/fiddler-hook.png rename to 11-tools/2-fiddler/fiddler-hook.png diff --git a/3-more/9-tools/2-fiddler/fiddler.png b/11-tools/2-fiddler/fiddler.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/2-fiddler/fiddler.png rename to 11-tools/2-fiddler/fiddler.png diff --git a/3-more/9-tools/3-ie-http-analyzer/article.md b/11-tools/3-ie-http-analyzer/article.md similarity index 100% rename from 3-more/9-tools/3-ie-http-analyzer/article.md rename to 11-tools/3-ie-http-analyzer/article.md diff --git a/3-more/9-tools/3-ie-http-analyzer/ie-http-analyzer-2.gif b/11-tools/3-ie-http-analyzer/ie-http-analyzer-2.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/3-ie-http-analyzer/ie-http-analyzer-2.gif rename to 11-tools/3-ie-http-analyzer/ie-http-analyzer-2.gif diff --git a/3-more/9-tools/3-ie-http-analyzer/ie-http-analyzer-3.gif b/11-tools/3-ie-http-analyzer/ie-http-analyzer-3.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/3-ie-http-analyzer/ie-http-analyzer-3.gif rename to 11-tools/3-ie-http-analyzer/ie-http-analyzer-3.gif diff --git a/3-more/9-tools/3-ie-http-analyzer/ie-http-analyzer.gif b/11-tools/3-ie-http-analyzer/ie-http-analyzer.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/9-tools/3-ie-http-analyzer/ie-http-analyzer.gif rename to 11-tools/3-ie-http-analyzer/ie-http-analyzer.gif diff --git a/3-more/9-tools/index.md b/11-tools/index.md similarity index 100% rename from 3-more/9-tools/index.md rename to 11-tools/index.md diff --git a/3-more/11-css-for-js/1-css-why/article.md b/12-css-for-js/1-css-why/article.md similarity index 100% rename from 3-more/11-css-for-js/1-css-why/article.md rename to 12-css-for-js/1-css-why/article.md diff --git a/3-more/11-css-for-js/10-box-sizing/article.md b/12-css-for-js/10-box-sizing/article.md similarity index 100% rename from 3-more/11-css-for-js/10-box-sizing/article.md rename to 12-css-for-js/10-box-sizing/article.md diff --git a/3-more/11-css-for-js/10-box-sizing/border-box.svg b/12-css-for-js/10-box-sizing/border-box.svg similarity index 100% rename from 3-more/11-css-for-js/10-box-sizing/border-box.svg rename to 12-css-for-js/10-box-sizing/border-box.svg diff --git a/3-more/11-css-for-js/11-margin/1-failing-margins/solution.md b/12-css-for-js/11-margin/1-failing-margins/solution.md similarity index 100% rename from 3-more/11-css-for-js/11-margin/1-failing-margins/solution.md rename to 12-css-for-js/11-margin/1-failing-margins/solution.md diff --git a/3-more/11-css-for-js/11-margin/1-failing-margins/task.md b/12-css-for-js/11-margin/1-failing-margins/task.md similarity index 100% rename from 3-more/11-css-for-js/11-margin/1-failing-margins/task.md rename to 12-css-for-js/11-margin/1-failing-margins/task.md diff --git a/3-more/11-css-for-js/11-margin/2-position-text-into-input/solution.md b/12-css-for-js/11-margin/2-position-text-into-input/solution.md similarity index 100% rename from 3-more/11-css-for-js/11-margin/2-position-text-into-input/solution.md rename to 12-css-for-js/11-margin/2-position-text-into-input/solution.md diff --git a/3-more/11-css-for-js/11-margin/2-position-text-into-input/solution.view/index.html b/12-css-for-js/11-margin/2-position-text-into-input/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/2-position-text-into-input/solution.view/index.html rename to 12-css-for-js/11-margin/2-position-text-into-input/solution.view/index.html diff --git a/3-more/11-css-for-js/11-margin/2-position-text-into-input/source.view/index.html b/12-css-for-js/11-margin/2-position-text-into-input/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/2-position-text-into-input/source.view/index.html rename to 12-css-for-js/11-margin/2-position-text-into-input/source.view/index.html diff --git a/3-more/11-css-for-js/11-margin/2-position-text-into-input/task.md b/12-css-for-js/11-margin/2-position-text-into-input/task.md similarity index 100% rename from 3-more/11-css-for-js/11-margin/2-position-text-into-input/task.md rename to 12-css-for-js/11-margin/2-position-text-into-input/task.md diff --git a/3-more/11-css-for-js/11-margin/article.md b/12-css-for-js/11-margin/article.md similarity index 100% rename from 3-more/11-css-for-js/11-margin/article.md rename to 12-css-for-js/11-margin/article.md diff --git a/3-more/11-css-for-js/11-margin/h2-margin-top-position.view/index.html b/12-css-for-js/11-margin/h2-margin-top-position.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/h2-margin-top-position.view/index.html rename to 12-css-for-js/11-margin/h2-margin-top-position.view/index.html diff --git a/3-more/11-css-for-js/11-margin/h2-margin-top.view/index.html b/12-css-for-js/11-margin/h2-margin-top.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/h2-margin-top.view/index.html rename to 12-css-for-js/11-margin/h2-margin-top.view/index.html diff --git a/3-more/11-css-for-js/11-margin/hr-margin-left-src.view/index.html b/12-css-for-js/11-margin/hr-margin-left-src.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/hr-margin-left-src.view/index.html rename to 12-css-for-js/11-margin/hr-margin-left-src.view/index.html diff --git a/3-more/11-css-for-js/11-margin/hr-margin-left.view/index.html b/12-css-for-js/11-margin/hr-margin-left.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/hr-margin-left.view/index.html rename to 12-css-for-js/11-margin/hr-margin-left.view/index.html diff --git a/3-more/11-css-for-js/11-margin/negative-margin-bottom.view/index.html b/12-css-for-js/11-margin/negative-margin-bottom.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/11-margin/negative-margin-bottom.view/index.html rename to 12-css-for-js/11-margin/negative-margin-bottom.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/article.md b/12-css-for-js/12-space-under-img/article.md similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/article.md rename to 12-css-for-js/12-space-under-img/article.md diff --git a/3-more/11-css-for-js/12-space-under-img/block.view/index.html b/12-css-for-js/12-space-under-img/block.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/block.view/index.html rename to 12-css-for-js/12-space-under-img/block.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/inline-p.view/index.html b/12-css-for-js/12-space-under-img/inline-p.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/inline-p.view/index.html rename to 12-css-for-js/12-space-under-img/inline-p.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/inline.view/index.html b/12-css-for-js/12-space-under-img/inline.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/inline.view/index.html rename to 12-css-for-js/12-space-under-img/inline.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/valign-p.view/index.html b/12-css-for-js/12-space-under-img/valign-p.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/valign-p.view/index.html rename to 12-css-for-js/12-space-under-img/valign-p.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/valign-small-lh.view/index.html b/12-css-for-js/12-space-under-img/valign-small-lh.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/valign-small-lh.view/index.html rename to 12-css-for-js/12-space-under-img/valign-small-lh.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/valign-small.view/index.html b/12-css-for-js/12-space-under-img/valign-small.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/valign-small.view/index.html rename to 12-css-for-js/12-space-under-img/valign-small.view/index.html diff --git a/3-more/11-css-for-js/12-space-under-img/valign.view/index.html b/12-css-for-js/12-space-under-img/valign.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/12-space-under-img/valign.view/index.html rename to 12-css-for-js/12-space-under-img/valign.view/index.html diff --git a/3-more/11-css-for-js/13-overflow/article.md b/12-css-for-js/13-overflow/article.md similarity index 100% rename from 3-more/11-css-for-js/13-overflow/article.md rename to 12-css-for-js/13-overflow/article.md diff --git a/3-more/11-css-for-js/14-height-percent/article.md b/12-css-for-js/14-height-percent/article.md similarity index 100% rename from 3-more/11-css-for-js/14-height-percent/article.md rename to 12-css-for-js/14-height-percent/article.md diff --git a/3-more/11-css-for-js/14-height-percent/height-percent-float-exact.view/index.html b/12-css-for-js/14-height-percent/height-percent-float-exact.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/14-height-percent/height-percent-float-exact.view/index.html rename to 12-css-for-js/14-height-percent/height-percent-float-exact.view/index.html diff --git a/3-more/11-css-for-js/14-height-percent/height-percent-float.view/index.html b/12-css-for-js/14-height-percent/height-percent-float.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/14-height-percent/height-percent-float.view/index.html rename to 12-css-for-js/14-height-percent/height-percent-float.view/index.html diff --git a/3-more/11-css-for-js/14-height-percent/height-percent.view/index.html b/12-css-for-js/14-height-percent/height-percent.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/14-height-percent/height-percent.view/index.html rename to 12-css-for-js/14-height-percent/height-percent.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/index.html b/12-css-for-js/15-css-selectors/1-select-elements-selector/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/index.html rename to 12-css-for-js/15-css-selectors/1-select-elements-selector/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/solution.md b/12-css-for-js/15-css-selectors/1-select-elements-selector/solution.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/solution.md rename to 12-css-for-js/15-css-selectors/1-select-elements-selector/solution.md diff --git a/3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/source.view/index.html b/12-css-for-js/15-css-selectors/1-select-elements-selector/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/source.view/index.html rename to 12-css-for-js/15-css-selectors/1-select-elements-selector/source.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/task.md b/12-css-for-js/15-css-selectors/1-select-elements-selector/task.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/1-select-elements-selector/task.md rename to 12-css-for-js/15-css-selectors/1-select-elements-selector/task.md diff --git a/3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.md b/12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.md rename to 12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.md diff --git a/3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.view/index.html b/12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.view/index.html rename to 12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/solution.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/source.view/index.html b/12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/source.view/index.html rename to 12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/source.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/task.md b/12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/task.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/task.md rename to 12-css-for-js/15-css-selectors/2-margin-between-pairs-size-1/task.md diff --git a/3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/index.html b/12-css-for-js/15-css-selectors/3-margin-between-pairs/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/index.html rename to 12-css-for-js/15-css-selectors/3-margin-between-pairs/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/solution.md b/12-css-for-js/15-css-selectors/3-margin-between-pairs/solution.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/solution.md rename to 12-css-for-js/15-css-selectors/3-margin-between-pairs/solution.md diff --git a/3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/solution.view/index.html b/12-css-for-js/15-css-selectors/3-margin-between-pairs/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/solution.view/index.html rename to 12-css-for-js/15-css-selectors/3-margin-between-pairs/solution.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/source.view/index.html b/12-css-for-js/15-css-selectors/3-margin-between-pairs/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/source.view/index.html rename to 12-css-for-js/15-css-selectors/3-margin-between-pairs/source.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/task.md b/12-css-for-js/15-css-selectors/3-margin-between-pairs/task.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/3-margin-between-pairs/task.md rename to 12-css-for-js/15-css-selectors/3-margin-between-pairs/task.md diff --git a/3-more/11-css-for-js/15-css-selectors/article.md b/12-css-for-js/15-css-selectors/article.md similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/article.md rename to 12-css-for-js/15-css-selectors/article.md diff --git a/3-more/11-css-for-js/15-css-selectors/nthchild-type.view/index.html b/12-css-for-js/15-css-selectors/nthchild-type.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/nthchild-type.view/index.html rename to 12-css-for-js/15-css-selectors/nthchild-type.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/nthchild.view/index.html b/12-css-for-js/15-css-selectors/nthchild.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/nthchild.view/index.html rename to 12-css-for-js/15-css-selectors/nthchild.view/index.html diff --git a/3-more/11-css-for-js/15-css-selectors/relation.view/index.html b/12-css-for-js/15-css-selectors/relation.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/15-css-selectors/relation.view/index.html rename to 12-css-for-js/15-css-selectors/relation.view/index.html diff --git a/3-more/11-css-for-js/16-css-no-ie6/article.md b/12-css-for-js/16-css-no-ie6/article.md similarity index 100% rename from 3-more/11-css-for-js/16-css-no-ie6/article.md rename to 12-css-for-js/16-css-no-ie6/article.md diff --git a/3-more/11-css-for-js/17-css-sprite/article.gif b/12-css-for-js/17-css-sprite/article.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/article.gif rename to 12-css-for-js/17-css-sprite/article.gif diff --git a/3-more/11-css-for-js/17-css-sprite/article.md b/12-css-for-js/17-css-sprite/article.md similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/article.md rename to 12-css-for-js/17-css-sprite/article.md diff --git a/3-more/11-css-for-js/17-css-sprite/height48.view/index.html b/12-css-for-js/17-css-sprite/height48.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/height48.view/index.html rename to 12-css-for-js/17-css-sprite/height48.view/index.html diff --git a/3-more/11-css-for-js/17-css-sprite/icons.gif b/12-css-for-js/17-css-sprite/icons.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/icons.gif rename to 12-css-for-js/17-css-sprite/icons.gif diff --git a/3-more/11-css-for-js/17-css-sprite/minus.gif b/12-css-for-js/17-css-sprite/minus.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/minus.gif rename to 12-css-for-js/17-css-sprite/minus.gif diff --git a/3-more/11-css-for-js/17-css-sprite/plus.gif b/12-css-for-js/17-css-sprite/plus.gif old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/plus.gif rename to 12-css-for-js/17-css-sprite/plus.gif diff --git a/3-more/11-css-for-js/17-css-sprite/sprite-example/index.html b/12-css-for-js/17-css-sprite/sprite-example/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprite-example/index.html rename to 12-css-for-js/17-css-sprite/sprite-example/index.html diff --git a/3-more/11-css-for-js/17-css-sprite/sprite-tree-1/height48.view/index.html b/12-css-for-js/17-css-sprite/sprite-tree-1/height48.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprite-tree-1/height48.view/index.html rename to 12-css-for-js/17-css-sprite/sprite-tree-1/height48.view/index.html diff --git a/3-more/11-css-for-js/17-css-sprite/sprite-tree-1/index.html b/12-css-for-js/17-css-sprite/sprite-tree-1/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprite-tree-1/index.html rename to 12-css-for-js/17-css-sprite/sprite-tree-1/index.html diff --git a/3-more/11-css-for-js/17-css-sprite/sprite-tree-src.view/index.html b/12-css-for-js/17-css-sprite/sprite-tree-src.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprite-tree-src.view/index.html rename to 12-css-for-js/17-css-sprite/sprite-tree-src.view/index.html diff --git a/3-more/11-css-for-js/17-css-sprite/sprite-tree.view/index.html b/12-css-for-js/17-css-sprite/sprite-tree.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprite-tree.view/index.html rename to 12-css-for-js/17-css-sprite/sprite-tree.view/index.html diff --git a/3-more/11-css-for-js/17-css-sprite/sprites-example-lines2.png b/12-css-for-js/17-css-sprite/sprites-example-lines2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprites-example-lines2.png rename to 12-css-for-js/17-css-sprite/sprites-example-lines2.png diff --git a/3-more/11-css-for-js/17-css-sprite/sprites-example.png b/12-css-for-js/17-css-sprite/sprites-example.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/17-css-sprite/sprites-example.png rename to 12-css-for-js/17-css-sprite/sprites-example.png diff --git a/3-more/11-css-for-js/18-css-format/article.md b/12-css-for-js/18-css-format/article.md similarity index 100% rename from 3-more/11-css-for-js/18-css-format/article.md rename to 12-css-for-js/18-css-format/article.md diff --git a/3-more/11-css-for-js/2-css-units/article.md b/12-css-for-js/2-css-units/article.md similarity index 100% rename from 3-more/11-css-for-js/2-css-units/article.md rename to 12-css-for-js/2-css-units/article.md diff --git a/3-more/11-css-for-js/3-display/article.md b/12-css-for-js/3-display/article.md similarity index 100% rename from 3-more/11-css-for-js/3-display/article.md rename to 12-css-for-js/3-display/article.md diff --git a/3-more/11-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.png b/12-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.png rename to 12-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.png diff --git a/3-more/11-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.view/index.html b/12-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.view/index.html rename to 12-css-for-js/4-float/1-inline-block-vs-float/gallery-float-diffsize.view/index.html diff --git a/3-more/11-css-for-js/4-float/1-inline-block-vs-float/gallery-inline-block.view/index.html b/12-css-for-js/4-float/1-inline-block-vs-float/gallery-inline-block.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/1-inline-block-vs-float/gallery-inline-block.view/index.html rename to 12-css-for-js/4-float/1-inline-block-vs-float/gallery-inline-block.view/index.html diff --git a/3-more/11-css-for-js/4-float/1-inline-block-vs-float/solution.md b/12-css-for-js/4-float/1-inline-block-vs-float/solution.md similarity index 100% rename from 3-more/11-css-for-js/4-float/1-inline-block-vs-float/solution.md rename to 12-css-for-js/4-float/1-inline-block-vs-float/solution.md diff --git a/3-more/11-css-for-js/4-float/1-inline-block-vs-float/solution.view/index.html b/12-css-for-js/4-float/1-inline-block-vs-float/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/1-inline-block-vs-float/solution.view/index.html rename to 12-css-for-js/4-float/1-inline-block-vs-float/solution.view/index.html diff --git a/3-more/11-css-for-js/4-float/1-inline-block-vs-float/task.md b/12-css-for-js/4-float/1-inline-block-vs-float/task.md similarity index 100% rename from 3-more/11-css-for-js/4-float/1-inline-block-vs-float/task.md rename to 12-css-for-js/4-float/1-inline-block-vs-float/task.md diff --git a/3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/solution.md b/12-css-for-js/4-float/2-tree-with-multiline-nodes/solution.md similarity index 100% rename from 3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/solution.md rename to 12-css-for-js/4-float/2-tree-with-multiline-nodes/solution.md diff --git a/3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/solution.view/index.html b/12-css-for-js/4-float/2-tree-with-multiline-nodes/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/solution.view/index.html rename to 12-css-for-js/4-float/2-tree-with-multiline-nodes/solution.view/index.html diff --git a/3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/source.view/index.html b/12-css-for-js/4-float/2-tree-with-multiline-nodes/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/source.view/index.html rename to 12-css-for-js/4-float/2-tree-with-multiline-nodes/source.view/index.html diff --git a/3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/task.md b/12-css-for-js/4-float/2-tree-with-multiline-nodes/task.md similarity index 100% rename from 3-more/11-css-for-js/4-float/2-tree-with-multiline-nodes/task.md rename to 12-css-for-js/4-float/2-tree-with-multiline-nodes/task.md diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-left.jpg b/12-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-left.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-left.jpg rename to 12-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-left.jpg diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-right.jpg b/12-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-right.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-right.jpg rename to 12-css-for-js/4-float/3-paginator-css/nav-div-wrong/arrow-right.jpg diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/nav-div-wrong/index.html b/12-css-for-js/4-float/3-paginator-css/nav-div-wrong/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/nav-div-wrong/index.html rename to 12-css-for-js/4-float/3-paginator-css/nav-div-wrong/index.html diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/solution.md b/12-css-for-js/4-float/3-paginator-css/solution.md similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/solution.md rename to 12-css-for-js/4-float/3-paginator-css/solution.md diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/solution.view/index.html b/12-css-for-js/4-float/3-paginator-css/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/solution.view/index.html rename to 12-css-for-js/4-float/3-paginator-css/solution.view/index.html diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/source.view/index.html b/12-css-for-js/4-float/3-paginator-css/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/source.view/index.html rename to 12-css-for-js/4-float/3-paginator-css/source.view/index.html diff --git a/3-more/11-css-for-js/4-float/3-paginator-css/task.md b/12-css-for-js/4-float/3-paginator-css/task.md similarity index 100% rename from 3-more/11-css-for-js/4-float/3-paginator-css/task.md rename to 12-css-for-js/4-float/3-paginator-css/task.md diff --git a/3-more/11-css-for-js/4-float/4-add-border-keep-width/solution.md b/12-css-for-js/4-float/4-add-border-keep-width/solution.md similarity index 100% rename from 3-more/11-css-for-js/4-float/4-add-border-keep-width/solution.md rename to 12-css-for-js/4-float/4-add-border-keep-width/solution.md diff --git a/3-more/11-css-for-js/4-float/4-add-border-keep-width/task.md b/12-css-for-js/4-float/4-add-border-keep-width/task.md similarity index 100% rename from 3-more/11-css-for-js/4-float/4-add-border-keep-width/task.md rename to 12-css-for-js/4-float/4-add-border-keep-width/task.md diff --git a/3-more/11-css-for-js/4-float/article.md b/12-css-for-js/4-float/article.md similarity index 100% rename from 3-more/11-css-for-js/4-float/article.md rename to 12-css-for-js/4-float/article.md diff --git a/3-more/11-css-for-js/4-float/float-small-margin.png b/12-css-for-js/4-float/float-small-margin.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/float-small-margin.png rename to 12-css-for-js/4-float/float-small-margin.png diff --git a/3-more/11-css-for-js/4-float/gallery-float.view/index.html b/12-css-for-js/4-float/gallery-float.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/gallery-float.view/index.html rename to 12-css-for-js/4-float/gallery-float.view/index.html diff --git a/3-more/11-css-for-js/4-float/text.png b/12-css-for-js/4-float/text.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/text.png rename to 12-css-for-js/4-float/text.png diff --git a/3-more/11-css-for-js/4-float/two-columns-2.view/index.html b/12-css-for-js/4-float/two-columns-2.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/two-columns-2.view/index.html rename to 12-css-for-js/4-float/two-columns-2.view/index.html diff --git a/3-more/11-css-for-js/4-float/two-columns.view/index.html b/12-css-for-js/4-float/two-columns.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/two-columns.view/index.html rename to 12-css-for-js/4-float/two-columns.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-block-bg.view/index.html b/12-css-for-js/4-float/winnie-block-bg.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-block-bg.view/index.html rename to 12-css-for-js/4-float/winnie-block-bg.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-block.view/index.html b/12-css-for-js/4-float/winnie-block.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-block.view/index.html rename to 12-css-for-js/4-float/winnie-block.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clear-1.view/index.html b/12-css-for-js/4-float/winnie-clear-1.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clear-1.view/index.html rename to 12-css-for-js/4-float/winnie-clear-1.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clear-2.view/index.html b/12-css-for-js/4-float/winnie-clear-2.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clear-2.view/index.html rename to 12-css-for-js/4-float/winnie-clear-2.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clear-3.view/index.html b/12-css-for-js/4-float/winnie-clear-3.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clear-3.view/index.html rename to 12-css-for-js/4-float/winnie-clear-3.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clear-4.view/index.html b/12-css-for-js/4-float/winnie-clear-4.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clear-4.view/index.html rename to 12-css-for-js/4-float/winnie-clear-4.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clearfill-clearfix.view/index.html b/12-css-for-js/4-float/winnie-clearfill-clearfix.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clearfill-clearfix.view/index.html rename to 12-css-for-js/4-float/winnie-clearfill-clearfix.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clearfill-div.view/index.html b/12-css-for-js/4-float/winnie-clearfill-div.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clearfill-div.view/index.html rename to 12-css-for-js/4-float/winnie-clearfill-div.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clearfill-float.view/index.html b/12-css-for-js/4-float/winnie-clearfill-float.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clearfill-float.view/index.html rename to 12-css-for-js/4-float/winnie-clearfill-float.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-clearfill-overflow.view/index.html b/12-css-for-js/4-float/winnie-clearfill-overflow.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-clearfill-overflow.view/index.html rename to 12-css-for-js/4-float/winnie-clearfill-overflow.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-nofloat-1.view/index.html b/12-css-for-js/4-float/winnie-nofloat-1.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-nofloat-1.view/index.html rename to 12-css-for-js/4-float/winnie-nofloat-1.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-nofloat-2.view/index.html b/12-css-for-js/4-float/winnie-nofloat-2.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-nofloat-2.view/index.html rename to 12-css-for-js/4-float/winnie-nofloat-2.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-nofloat-3.view/index.html b/12-css-for-js/4-float/winnie-nofloat-3.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-nofloat-3.view/index.html rename to 12-css-for-js/4-float/winnie-nofloat-3.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie-nofloat.view/index.html b/12-css-for-js/4-float/winnie-nofloat.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie-nofloat.view/index.html rename to 12-css-for-js/4-float/winnie-nofloat.view/index.html diff --git a/3-more/11-css-for-js/4-float/winnie.view/index.html b/12-css-for-js/4-float/winnie.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/4-float/winnie.view/index.html rename to 12-css-for-js/4-float/winnie.view/index.html diff --git a/3-more/11-css-for-js/5-position/1-modal-window/solution.md b/12-css-for-js/5-position/1-modal-window/solution.md similarity index 100% rename from 3-more/11-css-for-js/5-position/1-modal-window/solution.md rename to 12-css-for-js/5-position/1-modal-window/solution.md diff --git a/3-more/11-css-for-js/5-position/1-modal-window/solution.view/index.html b/12-css-for-js/5-position/1-modal-window/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/5-position/1-modal-window/solution.view/index.html rename to 12-css-for-js/5-position/1-modal-window/solution.view/index.html diff --git a/3-more/11-css-for-js/5-position/1-modal-window/source.view/index.html b/12-css-for-js/5-position/1-modal-window/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/5-position/1-modal-window/source.view/index.html rename to 12-css-for-js/5-position/1-modal-window/source.view/index.html diff --git a/3-more/11-css-for-js/5-position/1-modal-window/task.md b/12-css-for-js/5-position/1-modal-window/task.md similarity index 100% rename from 3-more/11-css-for-js/5-position/1-modal-window/task.md rename to 12-css-for-js/5-position/1-modal-window/task.md diff --git a/3-more/11-css-for-js/5-position/article.md b/12-css-for-js/5-position/article.md similarity index 100% rename from 3-more/11-css-for-js/5-position/article.md rename to 12-css-for-js/5-position/article.md diff --git a/3-more/11-css-for-js/5-position/position-100-wrong.view/index.html b/12-css-for-js/5-position/position-100-wrong.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/5-position/position-100-wrong.view/index.html rename to 12-css-for-js/5-position/position-100-wrong.view/index.html diff --git a/3-more/11-css-for-js/6-css-center/1-center-ball-css/solution.md b/12-css-for-js/6-css-center/1-center-ball-css/solution.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/1-center-ball-css/solution.md rename to 12-css-for-js/6-css-center/1-center-ball-css/solution.md diff --git a/3-more/11-css-for-js/6-css-center/1-center-ball-css/solution.view/index.html b/12-css-for-js/6-css-center/1-center-ball-css/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/6-css-center/1-center-ball-css/solution.view/index.html rename to 12-css-for-js/6-css-center/1-center-ball-css/solution.view/index.html diff --git a/3-more/11-css-for-js/6-css-center/1-center-ball-css/source.view/index.html b/12-css-for-js/6-css-center/1-center-ball-css/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/6-css-center/1-center-ball-css/source.view/index.html rename to 12-css-for-js/6-css-center/1-center-ball-css/source.view/index.html diff --git a/3-more/11-css-for-js/6-css-center/1-center-ball-css/task.md b/12-css-for-js/6-css-center/1-center-ball-css/task.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/1-center-ball-css/task.md rename to 12-css-for-js/6-css-center/1-center-ball-css/task.md diff --git a/3-more/11-css-for-js/6-css-center/2-form-modal/solution.md b/12-css-for-js/6-css-center/2-form-modal/solution.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/2-form-modal/solution.md rename to 12-css-for-js/6-css-center/2-form-modal/solution.md diff --git a/3-more/11-css-for-js/6-css-center/2-form-modal/solution.view/index.html b/12-css-for-js/6-css-center/2-form-modal/solution.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/6-css-center/2-form-modal/solution.view/index.html rename to 12-css-for-js/6-css-center/2-form-modal/solution.view/index.html diff --git a/3-more/11-css-for-js/6-css-center/2-form-modal/source.view/index.html b/12-css-for-js/6-css-center/2-form-modal/source.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/6-css-center/2-form-modal/source.view/index.html rename to 12-css-for-js/6-css-center/2-form-modal/source.view/index.html diff --git a/3-more/11-css-for-js/6-css-center/2-form-modal/task.md b/12-css-for-js/6-css-center/2-form-modal/task.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/2-form-modal/task.md rename to 12-css-for-js/6-css-center/2-form-modal/task.md diff --git a/3-more/11-css-for-js/6-css-center/3-vertical-align-table-cell-position/solution.md b/12-css-for-js/6-css-center/3-vertical-align-table-cell-position/solution.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/3-vertical-align-table-cell-position/solution.md rename to 12-css-for-js/6-css-center/3-vertical-align-table-cell-position/solution.md diff --git a/3-more/11-css-for-js/6-css-center/3-vertical-align-table-cell-position/task.md b/12-css-for-js/6-css-center/3-vertical-align-table-cell-position/task.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/3-vertical-align-table-cell-position/task.md rename to 12-css-for-js/6-css-center/3-vertical-align-table-cell-position/task.md diff --git a/3-more/11-css-for-js/6-css-center/article.md b/12-css-for-js/6-css-center/article.md similarity index 100% rename from 3-more/11-css-for-js/6-css-center/article.md rename to 12-css-for-js/6-css-center/article.md diff --git a/3-more/11-css-for-js/6-css-center/vertical-align.view/index.html b/12-css-for-js/6-css-center/vertical-align.view/index.html old mode 100755 new mode 100644 similarity index 100% rename from 3-more/11-css-for-js/6-css-center/vertical-align.view/index.html rename to 12-css-for-js/6-css-center/vertical-align.view/index.html diff --git a/3-more/11-css-for-js/7-font-size-line-height/article.md b/12-css-for-js/7-font-size-line-height/article.md similarity index 100% rename from 3-more/11-css-for-js/7-font-size-line-height/article.md rename to 12-css-for-js/7-font-size-line-height/article.md diff --git a/3-more/11-css-for-js/8-white-space/article.md b/12-css-for-js/8-white-space/article.md similarity index 100% rename from 3-more/11-css-for-js/8-white-space/article.md rename to 12-css-for-js/8-white-space/article.md diff --git a/3-more/11-css-for-js/9-outline/article.md b/12-css-for-js/9-outline/article.md similarity index 100% rename from 3-more/11-css-for-js/9-outline/article.md rename to 12-css-for-js/9-outline/article.md diff --git a/3-more/11-css-for-js/index.md b/12-css-for-js/index.md similarity index 100% rename from 3-more/11-css-for-js/index.md rename to 12-css-for-js/index.md diff --git a/3-more/index.md b/3-more/index.md deleted file mode 100644 index 91f11c38..00000000 --- a/3-more/index.md +++ /dev/null @@ -1,2 +0,0 @@ -# Дополнительные темы - diff --git a/3-more/1-webcomponents/1-webcomponents-intro/article.md b/3-webcomponents/1-webcomponents-intro/article.md similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/article.md rename to 3-webcomponents/1-webcomponents-intro/article.md diff --git a/3-more/1-webcomponents/1-webcomponents-intro/satellite-expanded.jpg b/3-webcomponents/1-webcomponents-intro/satellite-expanded.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/satellite-expanded.jpg rename to 3-webcomponents/1-webcomponents-intro/satellite-expanded.jpg diff --git a/3-more/1-webcomponents/1-webcomponents-intro/satellite-expanded@2x.jpg b/3-webcomponents/1-webcomponents-intro/satellite-expanded@2x.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/satellite-expanded@2x.jpg rename to 3-webcomponents/1-webcomponents-intro/satellite-expanded@2x.jpg diff --git a/3-more/1-webcomponents/1-webcomponents-intro/satellite.jpg b/3-webcomponents/1-webcomponents-intro/satellite.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/satellite.jpg rename to 3-webcomponents/1-webcomponents-intro/satellite.jpg diff --git a/3-more/1-webcomponents/1-webcomponents-intro/satellite@2x.jpg b/3-webcomponents/1-webcomponents-intro/satellite@2x.jpg old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/satellite@2x.jpg rename to 3-webcomponents/1-webcomponents-intro/satellite@2x.jpg diff --git a/3-more/1-webcomponents/1-webcomponents-intro/twitter-components.png b/3-webcomponents/1-webcomponents-intro/twitter-components.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/twitter-components.png rename to 3-webcomponents/1-webcomponents-intro/twitter-components.png diff --git a/3-more/1-webcomponents/1-webcomponents-intro/twitter-components@2x.png b/3-webcomponents/1-webcomponents-intro/twitter-components@2x.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/1-webcomponents-intro/twitter-components@2x.png rename to 3-webcomponents/1-webcomponents-intro/twitter-components@2x.png diff --git a/3-more/1-webcomponents/2-webcomponent-core/article.md b/3-webcomponents/2-webcomponent-core/article.md similarity index 100% rename from 3-more/1-webcomponents/2-webcomponent-core/article.md rename to 3-webcomponents/2-webcomponent-core/article.md diff --git a/3-more/1-webcomponents/3-shadow-dom/article.md b/3-webcomponents/3-shadow-dom/article.md similarity index 100% rename from 3-more/1-webcomponents/3-shadow-dom/article.md rename to 3-webcomponents/3-shadow-dom/article.md diff --git a/3-more/1-webcomponents/3-shadow-dom/shadow-content.png b/3-webcomponents/3-shadow-dom/shadow-content.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/3-shadow-dom/shadow-content.png rename to 3-webcomponents/3-shadow-dom/shadow-content.png diff --git a/3-more/1-webcomponents/3-shadow-dom/shadow-content@2x.png b/3-webcomponents/3-shadow-dom/shadow-content@2x.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/3-shadow-dom/shadow-content@2x.png rename to 3-webcomponents/3-shadow-dom/shadow-content@2x.png diff --git a/3-more/1-webcomponents/3-shadow-dom/shadow-dom-chrome.png b/3-webcomponents/3-shadow-dom/shadow-dom-chrome.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/3-shadow-dom/shadow-dom-chrome.png rename to 3-webcomponents/3-shadow-dom/shadow-dom-chrome.png diff --git a/3-more/1-webcomponents/3-shadow-dom/shadow-dom-chrome@2x.png b/3-webcomponents/3-shadow-dom/shadow-dom-chrome@2x.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/1-webcomponents/3-shadow-dom/shadow-dom-chrome@2x.png rename to 3-webcomponents/3-shadow-dom/shadow-dom-chrome@2x.png diff --git a/3-more/1-webcomponents/4-template-tag/article.md b/3-webcomponents/4-template-tag/article.md similarity index 100% rename from 3-more/1-webcomponents/4-template-tag/article.md rename to 3-webcomponents/4-template-tag/article.md diff --git a/3-more/1-webcomponents/5-css-scoping/article.md b/3-webcomponents/5-css-scoping/article.md similarity index 100% rename from 3-more/1-webcomponents/5-css-scoping/article.md rename to 3-webcomponents/5-css-scoping/article.md diff --git a/3-more/1-webcomponents/6-link-import/article.md b/3-webcomponents/6-link-import/article.md similarity index 100% rename from 3-more/1-webcomponents/6-link-import/article.md rename to 3-webcomponents/6-link-import/article.md diff --git a/3-more/1-webcomponents/6-link-import/import-show.view/index.html b/3-webcomponents/6-link-import/import-show.view/index.html similarity index 100% rename from 3-more/1-webcomponents/6-link-import/import-show.view/index.html rename to 3-webcomponents/6-link-import/import-show.view/index.html diff --git a/3-more/1-webcomponents/6-link-import/import-show.view/timer.html b/3-webcomponents/6-link-import/import-show.view/timer.html similarity index 100% rename from 3-more/1-webcomponents/6-link-import/import-show.view/timer.html rename to 3-webcomponents/6-link-import/import-show.view/timer.html diff --git a/3-more/1-webcomponents/6-link-import/import-style.view/index.html b/3-webcomponents/6-link-import/import-style.view/index.html similarity index 100% rename from 3-more/1-webcomponents/6-link-import/import-style.view/index.html rename to 3-webcomponents/6-link-import/import-style.view/index.html diff --git a/3-more/1-webcomponents/6-link-import/import-style.view/timer.html b/3-webcomponents/6-link-import/import-style.view/timer.html similarity index 100% rename from 3-more/1-webcomponents/6-link-import/import-style.view/timer.html rename to 3-webcomponents/6-link-import/import-style.view/timer.html diff --git a/3-more/1-webcomponents/7-webcomponent-build/article.md b/3-webcomponents/7-webcomponent-build/article.md similarity index 100% rename from 3-more/1-webcomponents/7-webcomponent-build/article.md rename to 3-webcomponents/7-webcomponent-build/article.md diff --git a/3-more/1-webcomponents/7-webcomponent-build/message.view/index.html b/3-webcomponents/7-webcomponent-build/message.view/index.html similarity index 100% rename from 3-more/1-webcomponents/7-webcomponent-build/message.view/index.html rename to 3-webcomponents/7-webcomponent-build/message.view/index.html diff --git a/3-more/1-webcomponents/7-webcomponent-build/message.view/ui-message.html b/3-webcomponents/7-webcomponent-build/message.view/ui-message.html similarity index 100% rename from 3-more/1-webcomponents/7-webcomponent-build/message.view/ui-message.html rename to 3-webcomponents/7-webcomponent-build/message.view/ui-message.html diff --git a/3-more/1-webcomponents/7-webcomponent-build/ui-slider.view/index.html b/3-webcomponents/7-webcomponent-build/ui-slider.view/index.html similarity index 100% rename from 3-more/1-webcomponents/7-webcomponent-build/ui-slider.view/index.html rename to 3-webcomponents/7-webcomponent-build/ui-slider.view/index.html diff --git a/3-more/1-webcomponents/7-webcomponent-build/ui-slider.view/jquery.html b/3-webcomponents/7-webcomponent-build/ui-slider.view/jquery.html similarity index 100% rename from 3-more/1-webcomponents/7-webcomponent-build/ui-slider.view/jquery.html rename to 3-webcomponents/7-webcomponent-build/ui-slider.view/jquery.html diff --git a/3-more/1-webcomponents/7-webcomponent-build/ui-slider.view/ui-slider.html b/3-webcomponents/7-webcomponent-build/ui-slider.view/ui-slider.html similarity index 100% rename from 3-more/1-webcomponents/7-webcomponent-build/ui-slider.view/ui-slider.html rename to 3-webcomponents/7-webcomponent-build/ui-slider.view/ui-slider.html diff --git a/3-more/1-webcomponents/index.md b/3-webcomponents/index.md similarity index 100% rename from 3-more/1-webcomponents/index.md rename to 3-webcomponents/index.md diff --git a/3-more/2-ajax/1-ajax-intro/article.md b/4-ajax/1-ajax-intro/article.md similarity index 100% rename from 3-more/2-ajax/1-ajax-intro/article.md rename to 4-ajax/1-ajax-intro/article.md diff --git a/3-more/2-ajax/1-ajax-intro/suggest.png b/4-ajax/1-ajax-intro/suggest.png similarity index 100% rename from 3-more/2-ajax/1-ajax-intro/suggest.png rename to 4-ajax/1-ajax-intro/suggest.png diff --git a/3-more/2-ajax/1-ajax-intro/tree.html b/4-ajax/1-ajax-intro/tree.html similarity index 100% rename from 3-more/2-ajax/1-ajax-intro/tree.html rename to 4-ajax/1-ajax-intro/tree.html diff --git a/3-more/2-ajax/10-ajax-jsonp/article.md b/4-ajax/10-ajax-jsonp/article.md similarity index 100% rename from 3-more/2-ajax/10-ajax-jsonp/article.md rename to 4-ajax/10-ajax-jsonp/article.md diff --git a/3-more/2-ajax/10-ajax-jsonp/jsonp.view/index.html b/4-ajax/10-ajax-jsonp/jsonp.view/index.html similarity index 100% rename from 3-more/2-ajax/10-ajax-jsonp/jsonp.view/index.html rename to 4-ajax/10-ajax-jsonp/jsonp.view/index.html diff --git a/3-more/2-ajax/10-ajax-jsonp/jsonp.view/scriptRequest.js b/4-ajax/10-ajax-jsonp/jsonp.view/scriptRequest.js similarity index 100% rename from 3-more/2-ajax/10-ajax-jsonp/jsonp.view/scriptRequest.js rename to 4-ajax/10-ajax-jsonp/jsonp.view/scriptRequest.js diff --git a/3-more/2-ajax/10-ajax-jsonp/jsonp.view/server.js b/4-ajax/10-ajax-jsonp/jsonp.view/server.js similarity index 100% rename from 3-more/2-ajax/10-ajax-jsonp/jsonp.view/server.js rename to 4-ajax/10-ajax-jsonp/jsonp.view/server.js diff --git a/3-more/2-ajax/11-server-sent-events/article.md b/4-ajax/11-server-sent-events/article.md similarity index 100% rename from 3-more/2-ajax/11-server-sent-events/article.md rename to 4-ajax/11-server-sent-events/article.md diff --git a/3-more/2-ajax/11-server-sent-events/eventsource.view/index.html b/4-ajax/11-server-sent-events/eventsource.view/index.html similarity index 100% rename from 3-more/2-ajax/11-server-sent-events/eventsource.view/index.html rename to 4-ajax/11-server-sent-events/eventsource.view/index.html diff --git a/3-more/2-ajax/11-server-sent-events/eventsource.view/server.js b/4-ajax/11-server-sent-events/eventsource.view/server.js similarity index 100% rename from 3-more/2-ajax/11-server-sent-events/eventsource.view/server.js rename to 4-ajax/11-server-sent-events/eventsource.view/server.js diff --git a/3-more/2-ajax/12-ajax-iframe/article.md b/4-ajax/12-ajax-iframe/article.md similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/article.md rename to 4-ajax/12-ajax-iframe/article.md diff --git a/3-more/2-ajax/12-ajax-iframe/comet.png b/4-ajax/12-ajax-iframe/comet.png similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/comet.png rename to 4-ajax/12-ajax-iframe/comet.png diff --git a/3-more/2-ajax/12-ajax-iframe/date-activex.view/activex.js b/4-ajax/12-ajax-iframe/date-activex.view/activex.js similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date-activex.view/activex.js rename to 4-ajax/12-ajax-iframe/date-activex.view/activex.js diff --git a/3-more/2-ajax/12-ajax-iframe/date-activex.view/index.html b/4-ajax/12-ajax-iframe/date-activex.view/index.html similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date-activex.view/index.html rename to 4-ajax/12-ajax-iframe/date-activex.view/index.html diff --git a/3-more/2-ajax/12-ajax-iframe/date-activex.view/server.js b/4-ajax/12-ajax-iframe/date-activex.view/server.js similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date-activex.view/server.js rename to 4-ajax/12-ajax-iframe/date-activex.view/server.js diff --git a/3-more/2-ajax/12-ajax-iframe/date-comet.view/iframeComet.js b/4-ajax/12-ajax-iframe/date-comet.view/iframeComet.js similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date-comet.view/iframeComet.js rename to 4-ajax/12-ajax-iframe/date-comet.view/iframeComet.js diff --git a/3-more/2-ajax/12-ajax-iframe/date-comet.view/index.html b/4-ajax/12-ajax-iframe/date-comet.view/index.html similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date-comet.view/index.html rename to 4-ajax/12-ajax-iframe/date-comet.view/index.html diff --git a/3-more/2-ajax/12-ajax-iframe/date-comet.view/server.js b/4-ajax/12-ajax-iframe/date-comet.view/server.js similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date-comet.view/server.js rename to 4-ajax/12-ajax-iframe/date-comet.view/server.js diff --git a/3-more/2-ajax/12-ajax-iframe/date.view/iframe.js b/4-ajax/12-ajax-iframe/date.view/iframe.js similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date.view/iframe.js rename to 4-ajax/12-ajax-iframe/date.view/iframe.js diff --git a/3-more/2-ajax/12-ajax-iframe/date.view/index.html b/4-ajax/12-ajax-iframe/date.view/index.html similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date.view/index.html rename to 4-ajax/12-ajax-iframe/date.view/index.html diff --git a/3-more/2-ajax/12-ajax-iframe/date.view/server.js b/4-ajax/12-ajax-iframe/date.view/server.js similarity index 100% rename from 3-more/2-ajax/12-ajax-iframe/date.view/server.js rename to 4-ajax/12-ajax-iframe/date.view/server.js diff --git a/3-more/2-ajax/13-csrf/article.md b/4-ajax/13-csrf/article.md similarity index 100% rename from 3-more/2-ajax/13-csrf/article.md rename to 4-ajax/13-csrf/article.md diff --git a/3-more/2-ajax/14-ajax-summary/article.md b/4-ajax/14-ajax-summary/article.md similarity index 100% rename from 3-more/2-ajax/14-ajax-summary/article.md rename to 4-ajax/14-ajax-summary/article.md diff --git a/3-more/2-ajax/2-ajax-nodejs/article.md b/4-ajax/2-ajax-nodejs/article.md similarity index 100% rename from 3-more/2-ajax/2-ajax-nodejs/article.md rename to 4-ajax/2-ajax-nodejs/article.md diff --git a/3-more/2-ajax/2-ajax-nodejs/example/index.html b/4-ajax/2-ajax-nodejs/example/index.html similarity index 100% rename from 3-more/2-ajax/2-ajax-nodejs/example/index.html rename to 4-ajax/2-ajax-nodejs/example/index.html diff --git a/3-more/2-ajax/2-ajax-nodejs/example/index.js b/4-ajax/2-ajax-nodejs/example/index.js similarity index 100% rename from 3-more/2-ajax/2-ajax-nodejs/example/index.js rename to 4-ajax/2-ajax-nodejs/example/index.js diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/index.html b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/index.html similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/index.html rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/index.html diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/phones.json b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/phones.json similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/phones.json rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/phones.json diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/server.js b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/server.js similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/server.js rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-async.view/server.js diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/index.html b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/index.html similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/index.html rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/index.html diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/phones.json b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/phones.json similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/phones.json rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/phones.json diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/server.js b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/server.js similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/server.js rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/phones-list.view/server.js diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/solution.md b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/solution.md similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/solution.md rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/solution.md diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/task.md b/4-ajax/3-ajax-xmlhttprequest/1-phones-list/task.md similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/1-phones-list/task.md rename to 4-ajax/3-ajax-xmlhttprequest/1-phones-list/task.md diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/article.md b/4-ajax/3-ajax-xmlhttprequest/article.md similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/article.md rename to 4-ajax/3-ajax-xmlhttprequest/article.md diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/phones-async.view/index.html b/4-ajax/3-ajax-xmlhttprequest/phones-async.view/index.html similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/phones-async.view/index.html rename to 4-ajax/3-ajax-xmlhttprequest/phones-async.view/index.html diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/phones-async.view/phones.json b/4-ajax/3-ajax-xmlhttprequest/phones-async.view/phones.json similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/phones-async.view/phones.json rename to 4-ajax/3-ajax-xmlhttprequest/phones-async.view/phones.json diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/phones-async.view/server.js b/4-ajax/3-ajax-xmlhttprequest/phones-async.view/server.js similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/phones-async.view/server.js rename to 4-ajax/3-ajax-xmlhttprequest/phones-async.view/server.js diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/phones.view/index.html b/4-ajax/3-ajax-xmlhttprequest/phones.view/index.html similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/phones.view/index.html rename to 4-ajax/3-ajax-xmlhttprequest/phones.view/index.html diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/phones.view/phones.json b/4-ajax/3-ajax-xmlhttprequest/phones.view/phones.json similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/phones.view/phones.json rename to 4-ajax/3-ajax-xmlhttprequest/phones.view/phones.json diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/phones.view/server.js b/4-ajax/3-ajax-xmlhttprequest/phones.view/server.js similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/phones.view/server.js rename to 4-ajax/3-ajax-xmlhttprequest/phones.view/server.js diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/readystate.view/index.html b/4-ajax/3-ajax-xmlhttprequest/readystate.view/index.html similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/readystate.view/index.html rename to 4-ajax/3-ajax-xmlhttprequest/readystate.view/index.html diff --git a/3-more/2-ajax/3-ajax-xmlhttprequest/readystate.view/server.js b/4-ajax/3-ajax-xmlhttprequest/readystate.view/server.js similarity index 100% rename from 3-more/2-ajax/3-ajax-xmlhttprequest/readystate.view/server.js rename to 4-ajax/3-ajax-xmlhttprequest/readystate.view/server.js diff --git a/3-more/2-ajax/4-xhr-forms/article.md b/4-ajax/4-xhr-forms/article.md similarity index 100% rename from 3-more/2-ajax/4-xhr-forms/article.md rename to 4-ajax/4-xhr-forms/article.md diff --git a/3-more/2-ajax/5-xhr-crossdomain/1-do-we-need-origin/solution.md b/4-ajax/5-xhr-crossdomain/1-do-we-need-origin/solution.md similarity index 100% rename from 3-more/2-ajax/5-xhr-crossdomain/1-do-we-need-origin/solution.md rename to 4-ajax/5-xhr-crossdomain/1-do-we-need-origin/solution.md diff --git a/3-more/2-ajax/5-xhr-crossdomain/1-do-we-need-origin/task.md b/4-ajax/5-xhr-crossdomain/1-do-we-need-origin/task.md similarity index 100% rename from 3-more/2-ajax/5-xhr-crossdomain/1-do-we-need-origin/task.md rename to 4-ajax/5-xhr-crossdomain/1-do-we-need-origin/task.md diff --git a/3-more/2-ajax/5-xhr-crossdomain/article.md b/4-ajax/5-xhr-crossdomain/article.md similarity index 100% rename from 3-more/2-ajax/5-xhr-crossdomain/article.md rename to 4-ajax/5-xhr-crossdomain/article.md diff --git a/3-more/2-ajax/5-xhr-crossdomain/xhr-another-domain.svg b/4-ajax/5-xhr-crossdomain/xhr-another-domain.svg similarity index 100% rename from 3-more/2-ajax/5-xhr-crossdomain/xhr-another-domain.svg rename to 4-ajax/5-xhr-crossdomain/xhr-another-domain.svg diff --git a/3-more/2-ajax/5-xhr-crossdomain/xhr-preflight.svg b/4-ajax/5-xhr-crossdomain/xhr-preflight.svg similarity index 100% rename from 3-more/2-ajax/5-xhr-crossdomain/xhr-preflight.svg rename to 4-ajax/5-xhr-crossdomain/xhr-preflight.svg diff --git a/3-more/2-ajax/6-xhr-onprogress/article.md b/4-ajax/6-xhr-onprogress/article.md similarity index 100% rename from 3-more/2-ajax/6-xhr-onprogress/article.md rename to 4-ajax/6-xhr-onprogress/article.md diff --git a/3-more/2-ajax/6-xhr-onprogress/progress.view/index.html b/4-ajax/6-xhr-onprogress/progress.view/index.html similarity index 100% rename from 3-more/2-ajax/6-xhr-onprogress/progress.view/index.html rename to 4-ajax/6-xhr-onprogress/progress.view/index.html diff --git a/3-more/2-ajax/6-xhr-onprogress/progress.view/server.js b/4-ajax/6-xhr-onprogress/progress.view/server.js similarity index 100% rename from 3-more/2-ajax/6-xhr-onprogress/progress.view/server.js rename to 4-ajax/6-xhr-onprogress/progress.view/server.js diff --git a/3-more/2-ajax/7-xhr-resume/article.md b/4-ajax/7-xhr-resume/article.md similarity index 100% rename from 3-more/2-ajax/7-xhr-resume/article.md rename to 4-ajax/7-xhr-resume/article.md diff --git a/3-more/2-ajax/7-xhr-resume/upload-resume.view/index.html b/4-ajax/7-xhr-resume/upload-resume.view/index.html similarity index 100% rename from 3-more/2-ajax/7-xhr-resume/upload-resume.view/index.html rename to 4-ajax/7-xhr-resume/upload-resume.view/index.html diff --git a/3-more/2-ajax/7-xhr-resume/upload-resume.view/server.js b/4-ajax/7-xhr-resume/upload-resume.view/server.js similarity index 100% rename from 3-more/2-ajax/7-xhr-resume/upload-resume.view/server.js rename to 4-ajax/7-xhr-resume/upload-resume.view/server.js diff --git a/3-more/2-ajax/7-xhr-resume/upload-resume.view/uploader.js b/4-ajax/7-xhr-resume/upload-resume.view/uploader.js similarity index 100% rename from 3-more/2-ajax/7-xhr-resume/upload-resume.view/uploader.js rename to 4-ajax/7-xhr-resume/upload-resume.view/uploader.js diff --git a/3-more/2-ajax/8-xhr-longpoll/article.md b/4-ajax/8-xhr-longpoll/article.md similarity index 100% rename from 3-more/2-ajax/8-xhr-longpoll/article.md rename to 4-ajax/8-xhr-longpoll/article.md diff --git a/3-more/2-ajax/8-xhr-longpoll/longpoll.png b/4-ajax/8-xhr-longpoll/longpoll.png similarity index 100% rename from 3-more/2-ajax/8-xhr-longpoll/longpoll.png rename to 4-ajax/8-xhr-longpoll/longpoll.png diff --git a/3-more/2-ajax/8-xhr-longpoll/longpoll.view/browser.js b/4-ajax/8-xhr-longpoll/longpoll.view/browser.js similarity index 100% rename from 3-more/2-ajax/8-xhr-longpoll/longpoll.view/browser.js rename to 4-ajax/8-xhr-longpoll/longpoll.view/browser.js diff --git a/3-more/2-ajax/8-xhr-longpoll/longpoll.view/index.html b/4-ajax/8-xhr-longpoll/longpoll.view/index.html similarity index 100% rename from 3-more/2-ajax/8-xhr-longpoll/longpoll.view/index.html rename to 4-ajax/8-xhr-longpoll/longpoll.view/index.html diff --git a/3-more/2-ajax/8-xhr-longpoll/longpoll.view/server.js b/4-ajax/8-xhr-longpoll/longpoll.view/server.js similarity index 100% rename from 3-more/2-ajax/8-xhr-longpoll/longpoll.view/server.js rename to 4-ajax/8-xhr-longpoll/longpoll.view/server.js diff --git a/3-more/2-ajax/9-websockets/article.md b/4-ajax/9-websockets/article.md similarity index 100% rename from 3-more/2-ajax/9-websockets/article.md rename to 4-ajax/9-websockets/article.md diff --git a/3-more/2-ajax/index.md b/4-ajax/index.md similarity index 100% rename from 3-more/2-ajax/index.md rename to 4-ajax/index.md diff --git a/3-more/3-animation/1-bezier/article.md b/5-animation/1-bezier/article.md similarity index 100% rename from 3-more/3-animation/1-bezier/article.md rename to 5-animation/1-bezier/article.md diff --git a/3-more/3-animation/1-bezier/bezier2.png b/5-animation/1-bezier/bezier2.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier2.png rename to 5-animation/1-bezier/bezier2.png diff --git a/3-more/3-animation/1-bezier/bezier3-draw1.png b/5-animation/1-bezier/bezier3-draw1.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier3-draw1.png rename to 5-animation/1-bezier/bezier3-draw1.png diff --git a/3-more/3-animation/1-bezier/bezier3-draw2.png b/5-animation/1-bezier/bezier3-draw2.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier3-draw2.png rename to 5-animation/1-bezier/bezier3-draw2.png diff --git a/3-more/3-animation/1-bezier/bezier3-e.png b/5-animation/1-bezier/bezier3-e.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier3-e.png rename to 5-animation/1-bezier/bezier3-e.png diff --git a/3-more/3-animation/1-bezier/bezier3.png b/5-animation/1-bezier/bezier3.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier3.png rename to 5-animation/1-bezier/bezier3.png diff --git a/3-more/3-animation/1-bezier/bezier4-e.png b/5-animation/1-bezier/bezier4-e.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier4-e.png rename to 5-animation/1-bezier/bezier4-e.png diff --git a/3-more/3-animation/1-bezier/bezier4.png b/5-animation/1-bezier/bezier4.png similarity index 100% rename from 3-more/3-animation/1-bezier/bezier4.png rename to 5-animation/1-bezier/bezier4.png diff --git a/3-more/3-animation/1-bezier/car.jpg b/5-animation/1-bezier/car.jpg similarity index 100% rename from 3-more/3-animation/1-bezier/car.jpg rename to 5-animation/1-bezier/car.jpg diff --git a/3-more/3-animation/1-bezier/demo.svg b/5-animation/1-bezier/demo.svg similarity index 100% rename from 3-more/3-animation/1-bezier/demo.svg rename to 5-animation/1-bezier/demo.svg diff --git a/3-more/3-animation/1-bezier/letter_m.png b/5-animation/1-bezier/letter_m.png similarity index 100% rename from 3-more/3-animation/1-bezier/letter_m.png rename to 5-animation/1-bezier/letter_m.png diff --git a/3-more/3-animation/1-bezier/play.png b/5-animation/1-bezier/play.png similarity index 100% rename from 3-more/3-animation/1-bezier/play.png rename to 5-animation/1-bezier/play.png diff --git a/3-more/3-animation/1-bezier/vase.png b/5-animation/1-bezier/vase.png similarity index 100% rename from 3-more/3-animation/1-bezier/vase.png rename to 5-animation/1-bezier/vase.png diff --git a/3-more/3-animation/2-css-transitions/1-animate-logo-css/solution.md b/5-animation/2-css-transitions/1-animate-logo-css/solution.md similarity index 100% rename from 3-more/3-animation/2-css-transitions/1-animate-logo-css/solution.md rename to 5-animation/2-css-transitions/1-animate-logo-css/solution.md diff --git a/3-more/3-animation/2-css-transitions/1-animate-logo-css/solution.view/index.html b/5-animation/2-css-transitions/1-animate-logo-css/solution.view/index.html similarity index 100% rename from 3-more/3-animation/2-css-transitions/1-animate-logo-css/solution.view/index.html rename to 5-animation/2-css-transitions/1-animate-logo-css/solution.view/index.html diff --git a/3-more/3-animation/2-css-transitions/1-animate-logo-css/source.view/animate.js b/5-animation/2-css-transitions/1-animate-logo-css/source.view/animate.js similarity index 100% rename from 3-more/3-animation/2-css-transitions/1-animate-logo-css/source.view/animate.js rename to 5-animation/2-css-transitions/1-animate-logo-css/source.view/animate.js diff --git a/3-more/3-animation/2-css-transitions/1-animate-logo-css/source.view/index.html b/5-animation/2-css-transitions/1-animate-logo-css/source.view/index.html similarity index 100% rename from 3-more/3-animation/2-css-transitions/1-animate-logo-css/source.view/index.html rename to 5-animation/2-css-transitions/1-animate-logo-css/source.view/index.html diff --git a/3-more/3-animation/2-css-transitions/1-animate-logo-css/task.md b/5-animation/2-css-transitions/1-animate-logo-css/task.md similarity index 100% rename from 3-more/3-animation/2-css-transitions/1-animate-logo-css/task.md rename to 5-animation/2-css-transitions/1-animate-logo-css/task.md diff --git a/3-more/3-animation/2-css-transitions/article.md b/5-animation/2-css-transitions/article.md similarity index 100% rename from 3-more/3-animation/2-css-transitions/article.md rename to 5-animation/2-css-transitions/article.md diff --git a/3-more/3-animation/2-css-transitions/boat.view/index.html b/5-animation/2-css-transitions/boat.view/index.html similarity index 100% rename from 3-more/3-animation/2-css-transitions/boat.view/index.html rename to 5-animation/2-css-transitions/boat.view/index.html diff --git a/3-more/3-animation/2-css-transitions/ease-in-out.png b/5-animation/2-css-transitions/ease-in-out.png similarity index 100% rename from 3-more/3-animation/2-css-transitions/ease-in-out.png rename to 5-animation/2-css-transitions/ease-in-out.png diff --git a/3-more/3-animation/2-css-transitions/ease-in.png b/5-animation/2-css-transitions/ease-in.png similarity index 100% rename from 3-more/3-animation/2-css-transitions/ease-in.png rename to 5-animation/2-css-transitions/ease-in.png diff --git a/3-more/3-animation/2-css-transitions/ease-out.png b/5-animation/2-css-transitions/ease-out.png similarity index 100% rename from 3-more/3-animation/2-css-transitions/ease-out.png rename to 5-animation/2-css-transitions/ease-out.png diff --git a/3-more/3-animation/2-css-transitions/ease.png b/5-animation/2-css-transitions/ease.png similarity index 100% rename from 3-more/3-animation/2-css-transitions/ease.png rename to 5-animation/2-css-transitions/ease.png diff --git a/3-more/3-animation/2-css-transitions/train-curve.png b/5-animation/2-css-transitions/train-curve.png similarity index 100% rename from 3-more/3-animation/2-css-transitions/train-curve.png rename to 5-animation/2-css-transitions/train-curve.png diff --git a/3-more/3-animation/3-js-animation/1-carousel-animated/solution.md b/5-animation/3-js-animation/1-carousel-animated/solution.md similarity index 100% rename from 3-more/3-animation/3-js-animation/1-carousel-animated/solution.md rename to 5-animation/3-js-animation/1-carousel-animated/solution.md diff --git a/3-more/3-animation/3-js-animation/1-carousel-animated/solution.view/animate.js b/5-animation/3-js-animation/1-carousel-animated/solution.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/1-carousel-animated/solution.view/animate.js rename to 5-animation/3-js-animation/1-carousel-animated/solution.view/animate.js diff --git a/3-more/3-animation/3-js-animation/1-carousel-animated/solution.view/index.html b/5-animation/3-js-animation/1-carousel-animated/solution.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/1-carousel-animated/solution.view/index.html rename to 5-animation/3-js-animation/1-carousel-animated/solution.view/index.html diff --git a/3-more/3-animation/3-js-animation/1-carousel-animated/solution.view/style.css b/5-animation/3-js-animation/1-carousel-animated/solution.view/style.css similarity index 100% rename from 3-more/3-animation/3-js-animation/1-carousel-animated/solution.view/style.css rename to 5-animation/3-js-animation/1-carousel-animated/solution.view/style.css diff --git a/3-more/3-animation/3-js-animation/1-carousel-animated/task.md b/5-animation/3-js-animation/1-carousel-animated/task.md similarity index 100% rename from 3-more/3-animation/3-js-animation/1-carousel-animated/task.md rename to 5-animation/3-js-animation/1-carousel-animated/task.md diff --git a/3-more/3-animation/3-js-animation/2-animate-logo/solution.md b/5-animation/3-js-animation/2-animate-logo/solution.md similarity index 100% rename from 3-more/3-animation/3-js-animation/2-animate-logo/solution.md rename to 5-animation/3-js-animation/2-animate-logo/solution.md diff --git a/3-more/3-animation/3-js-animation/2-animate-logo/solution.view/animate.js b/5-animation/3-js-animation/2-animate-logo/solution.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/2-animate-logo/solution.view/animate.js rename to 5-animation/3-js-animation/2-animate-logo/solution.view/animate.js diff --git a/3-more/3-animation/3-js-animation/2-animate-logo/solution.view/index.html b/5-animation/3-js-animation/2-animate-logo/solution.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/2-animate-logo/solution.view/index.html rename to 5-animation/3-js-animation/2-animate-logo/solution.view/index.html diff --git a/3-more/3-animation/3-js-animation/2-animate-logo/source.view/animate.js b/5-animation/3-js-animation/2-animate-logo/source.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/2-animate-logo/source.view/animate.js rename to 5-animation/3-js-animation/2-animate-logo/source.view/animate.js diff --git a/3-more/3-animation/3-js-animation/2-animate-logo/source.view/index.html b/5-animation/3-js-animation/2-animate-logo/source.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/2-animate-logo/source.view/index.html rename to 5-animation/3-js-animation/2-animate-logo/source.view/index.html diff --git a/3-more/3-animation/3-js-animation/2-animate-logo/task.md b/5-animation/3-js-animation/2-animate-logo/task.md similarity index 100% rename from 3-more/3-animation/3-js-animation/2-animate-logo/task.md rename to 5-animation/3-js-animation/2-animate-logo/task.md diff --git a/3-more/3-animation/3-js-animation/3-animate-ball/solution.md b/5-animation/3-js-animation/3-animate-ball/solution.md similarity index 100% rename from 3-more/3-animation/3-js-animation/3-animate-ball/solution.md rename to 5-animation/3-js-animation/3-animate-ball/solution.md diff --git a/3-more/3-animation/3-js-animation/3-animate-ball/solution.view/animate.js b/5-animation/3-js-animation/3-animate-ball/solution.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/3-animate-ball/solution.view/animate.js rename to 5-animation/3-js-animation/3-animate-ball/solution.view/animate.js diff --git a/3-more/3-animation/3-js-animation/3-animate-ball/solution.view/index.html b/5-animation/3-js-animation/3-animate-ball/solution.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/3-animate-ball/solution.view/index.html rename to 5-animation/3-js-animation/3-animate-ball/solution.view/index.html diff --git a/3-more/3-animation/3-js-animation/3-animate-ball/source.view/animate.js b/5-animation/3-js-animation/3-animate-ball/source.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/3-animate-ball/source.view/animate.js rename to 5-animation/3-js-animation/3-animate-ball/source.view/animate.js diff --git a/3-more/3-animation/3-js-animation/3-animate-ball/source.view/index.html b/5-animation/3-js-animation/3-animate-ball/source.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/3-animate-ball/source.view/index.html rename to 5-animation/3-js-animation/3-animate-ball/source.view/index.html diff --git a/3-more/3-animation/3-js-animation/3-animate-ball/task.md b/5-animation/3-js-animation/3-animate-ball/task.md similarity index 100% rename from 3-more/3-animation/3-js-animation/3-animate-ball/task.md rename to 5-animation/3-js-animation/3-animate-ball/task.md diff --git a/3-more/3-animation/3-js-animation/4-animate-ball-hops/solution.md b/5-animation/3-js-animation/4-animate-ball-hops/solution.md similarity index 100% rename from 3-more/3-animation/3-js-animation/4-animate-ball-hops/solution.md rename to 5-animation/3-js-animation/4-animate-ball-hops/solution.md diff --git a/3-more/3-animation/3-js-animation/4-animate-ball-hops/solution.view/animate.js b/5-animation/3-js-animation/4-animate-ball-hops/solution.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/4-animate-ball-hops/solution.view/animate.js rename to 5-animation/3-js-animation/4-animate-ball-hops/solution.view/animate.js diff --git a/3-more/3-animation/3-js-animation/4-animate-ball-hops/solution.view/index.html b/5-animation/3-js-animation/4-animate-ball-hops/solution.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/4-animate-ball-hops/solution.view/index.html rename to 5-animation/3-js-animation/4-animate-ball-hops/solution.view/index.html diff --git a/3-more/3-animation/3-js-animation/4-animate-ball-hops/source.view/animate.js b/5-animation/3-js-animation/4-animate-ball-hops/source.view/animate.js similarity index 100% rename from 3-more/3-animation/3-js-animation/4-animate-ball-hops/source.view/animate.js rename to 5-animation/3-js-animation/4-animate-ball-hops/source.view/animate.js diff --git a/3-more/3-animation/3-js-animation/4-animate-ball-hops/source.view/index.html b/5-animation/3-js-animation/4-animate-ball-hops/source.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/4-animate-ball-hops/source.view/index.html rename to 5-animation/3-js-animation/4-animate-ball-hops/source.view/index.html diff --git a/3-more/3-animation/3-js-animation/4-animate-ball-hops/task.md b/5-animation/3-js-animation/4-animate-ball-hops/task.md similarity index 100% rename from 3-more/3-animation/3-js-animation/4-animate-ball-hops/task.md rename to 5-animation/3-js-animation/4-animate-ball-hops/task.md diff --git a/3-more/3-animation/3-js-animation/article.md b/5-animation/3-js-animation/article.md similarity index 100% rename from 3-more/3-animation/3-js-animation/article.md rename to 5-animation/3-js-animation/article.md diff --git a/3-more/3-animation/3-js-animation/back.svg b/5-animation/3-js-animation/back.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/back.svg rename to 5-animation/3-js-animation/back.svg diff --git a/3-more/3-animation/3-js-animation/bounce-inout.svg b/5-animation/3-js-animation/bounce-inout.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/bounce-inout.svg rename to 5-animation/3-js-animation/bounce-inout.svg diff --git a/3-more/3-animation/3-js-animation/circ-ease.svg b/5-animation/3-js-animation/circ-ease.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/circ-ease.svg rename to 5-animation/3-js-animation/circ-ease.svg diff --git a/3-more/3-animation/3-js-animation/circ.svg b/5-animation/3-js-animation/circ.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/circ.svg rename to 5-animation/3-js-animation/circ.svg diff --git a/3-more/3-animation/3-js-animation/elastic.svg b/5-animation/3-js-animation/elastic.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/elastic.svg rename to 5-animation/3-js-animation/elastic.svg diff --git a/3-more/3-animation/3-js-animation/linear.svg b/5-animation/3-js-animation/linear.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/linear.svg rename to 5-animation/3-js-animation/linear.svg diff --git a/3-more/3-animation/3-js-animation/move.view/index.html b/5-animation/3-js-animation/move.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/move.view/index.html rename to 5-animation/3-js-animation/move.view/index.html diff --git a/3-more/3-animation/3-js-animation/move100.view/index.html b/5-animation/3-js-animation/move100.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/move100.view/index.html rename to 5-animation/3-js-animation/move100.view/index.html diff --git a/3-more/3-animation/3-js-animation/quad.svg b/5-animation/3-js-animation/quad.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/quad.svg rename to 5-animation/3-js-animation/quad.svg diff --git a/3-more/3-animation/3-js-animation/quint.svg b/5-animation/3-js-animation/quint.svg similarity index 100% rename from 3-more/3-animation/3-js-animation/quint.svg rename to 5-animation/3-js-animation/quint.svg diff --git a/3-more/3-animation/3-js-animation/width.view/index.html b/5-animation/3-js-animation/width.view/index.html similarity index 100% rename from 3-more/3-animation/3-js-animation/width.view/index.html rename to 5-animation/3-js-animation/width.view/index.html diff --git a/3-more/3-animation/index.md b/5-animation/index.md similarity index 100% rename from 3-more/3-animation/index.md rename to 5-animation/index.md diff --git a/3-more/4-optimize/1-memory-leaks/article.md b/6-optimize/1-memory-leaks/article.md similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/article.md rename to 6-optimize/1-memory-leaks/article.md diff --git a/3-more/4-optimize/1-memory-leaks/chrome.png b/6-optimize/1-memory-leaks/chrome.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/chrome.png rename to 6-optimize/1-memory-leaks/chrome.png diff --git a/3-more/4-optimize/1-memory-leaks/goodluck.png b/6-optimize/1-memory-leaks/goodluck.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/goodluck.png rename to 6-optimize/1-memory-leaks/goodluck.png diff --git a/3-more/4-optimize/1-memory-leaks/ie1.png b/6-optimize/1-memory-leaks/ie1.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/ie1.png rename to 6-optimize/1-memory-leaks/ie1.png diff --git a/3-more/4-optimize/1-memory-leaks/ie2.png b/6-optimize/1-memory-leaks/ie2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/ie2.png rename to 6-optimize/1-memory-leaks/ie2.png diff --git a/3-more/4-optimize/1-memory-leaks/ie9_disable1.png b/6-optimize/1-memory-leaks/ie9_disable1.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/ie9_disable1.png rename to 6-optimize/1-memory-leaks/ie9_disable1.png diff --git a/3-more/4-optimize/1-memory-leaks/ie9_disable2.png b/6-optimize/1-memory-leaks/ie9_disable2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/ie9_disable2.png rename to 6-optimize/1-memory-leaks/ie9_disable2.png diff --git a/3-more/4-optimize/1-memory-leaks/leak-ie8-2.view/index.html b/6-optimize/1-memory-leaks/leak-ie8-2.view/index.html similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/leak-ie8-2.view/index.html rename to 6-optimize/1-memory-leaks/leak-ie8-2.view/index.html diff --git a/3-more/4-optimize/1-memory-leaks/leak-ie8-table.view/index.html b/6-optimize/1-memory-leaks/leak-ie8-table.view/index.html similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/leak-ie8-table.view/index.html rename to 6-optimize/1-memory-leaks/leak-ie8-table.view/index.html diff --git a/3-more/4-optimize/1-memory-leaks/leak-ie8-widget.view/index.html b/6-optimize/1-memory-leaks/leak-ie8-widget.view/index.html similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/leak-ie8-widget.view/index.html rename to 6-optimize/1-memory-leaks/leak-ie8-widget.view/index.html diff --git a/3-more/4-optimize/1-memory-leaks/leak-ie8-xhr.view/index.html b/6-optimize/1-memory-leaks/leak-ie8-xhr.view/index.html similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/leak-ie8-xhr.view/index.html rename to 6-optimize/1-memory-leaks/leak-ie8-xhr.view/index.html diff --git a/3-more/4-optimize/1-memory-leaks/leak-ie8.view/index.html b/6-optimize/1-memory-leaks/leak-ie8.view/index.html similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/leak-ie8.view/index.html rename to 6-optimize/1-memory-leaks/leak-ie8.view/index.html diff --git a/3-more/4-optimize/1-memory-leaks/xhr.png b/6-optimize/1-memory-leaks/xhr.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/xhr.png rename to 6-optimize/1-memory-leaks/xhr.png diff --git a/3-more/4-optimize/1-memory-leaks/xhr2.png b/6-optimize/1-memory-leaks/xhr2.png old mode 100755 new mode 100644 similarity index 100% rename from 3-more/4-optimize/1-memory-leaks/xhr2.png rename to 6-optimize/1-memory-leaks/xhr2.png diff --git a/3-more/4-optimize/2-memory-leaks-jquery/article.md b/6-optimize/2-memory-leaks-jquery/article.md similarity index 100% rename from 3-more/4-optimize/2-memory-leaks-jquery/article.md rename to 6-optimize/2-memory-leaks-jquery/article.md diff --git a/3-more/4-optimize/2-memory-leaks-jquery/jquery-leak.view/index.html b/6-optimize/2-memory-leaks-jquery/jquery-leak.view/index.html similarity index 100% rename from 3-more/4-optimize/2-memory-leaks-jquery/jquery-leak.view/index.html rename to 6-optimize/2-memory-leaks-jquery/jquery-leak.view/index.html diff --git a/3-more/4-optimize/3-minification/article.md b/6-optimize/3-minification/article.md similarity index 100% rename from 3-more/4-optimize/3-minification/article.md rename to 6-optimize/3-minification/article.md diff --git a/3-more/4-optimize/3-minification/my.svg b/6-optimize/3-minification/my.svg similarity index 100% rename from 3-more/4-optimize/3-minification/my.svg rename to 6-optimize/3-minification/my.svg diff --git a/3-more/4-optimize/4-better-minification/article.md b/6-optimize/4-better-minification/article.md similarity index 100% rename from 3-more/4-optimize/4-better-minification/article.md rename to 6-optimize/4-better-minification/article.md diff --git a/3-more/4-optimize/5-gcc-advanced-optimization/article.md b/6-optimize/5-gcc-advanced-optimization/article.md similarity index 100% rename from 3-more/4-optimize/5-gcc-advanced-optimization/article.md rename to 6-optimize/5-gcc-advanced-optimization/article.md diff --git a/3-more/4-optimize/6-gcc-check-types/article.md b/6-optimize/6-gcc-check-types/article.md similarity index 100% rename from 3-more/4-optimize/6-gcc-check-types/article.md rename to 6-optimize/6-gcc-check-types/article.md diff --git a/3-more/4-optimize/7-gcc-closure-library/article.md b/6-optimize/7-gcc-closure-library/article.md similarity index 100% rename from 3-more/4-optimize/7-gcc-closure-library/article.md rename to 6-optimize/7-gcc-closure-library/article.md diff --git a/3-more/4-optimize/index.md b/6-optimize/index.md similarity index 100% rename from 3-more/4-optimize/index.md rename to 6-optimize/index.md diff --git a/3-more/5-frames-and-windows/1-window-open/article.md b/7-frames-and-windows/1-window-open/article.md similarity index 100% rename from 3-more/5-frames-and-windows/1-window-open/article.md rename to 7-frames-and-windows/1-window-open/article.md diff --git a/3-more/5-frames-and-windows/2-iframes/article.md b/7-frames-and-windows/2-iframes/article.md similarity index 91% rename from 3-more/5-frames-and-windows/2-iframes/article.md rename to 7-frames-and-windows/2-iframes/article.md index 4f41e08b..757c55a2 100644 --- a/3-more/5-frames-and-windows/2-iframes/article.md +++ b/7-frames-and-windows/2-iframes/article.md @@ -30,9 +30,7 @@ [smart header="src='javascript:...'"] Атрибут `src` может использовать протокол `javascript:...`. При этом код выполняется и его результат будет содержимым ифрейма. Этот способ описан в стандарте и поддерживается всеми браузерами. -Атрибут `src` является обязательным, и его отсутствие может привести к проблемам, вплоть до игнорирования ифрейма браузером. - -Чтобы ничего не загружать в ифрейм, можно указать `src="javascript:''"`. +Атрибут `src` является обязательным, и его отсутствие может привести к проблемам, вплоть до игнорирования ифрейма браузером. Чтобы ничего не загружать в ифрейм, можно указать пустую строку: `src="javascript:''"`. [/smart] ## Кросс-доменность: ограничение доступа к окну @@ -41,7 +39,7 @@ Внешний документ имеет полный доступ к `