diff --git a/5-animation/1-bezier-curve/article.md b/3-animation/1-bezier-curve/article.md
similarity index 100%
rename from 5-animation/1-bezier-curve/article.md
rename to 3-animation/1-bezier-curve/article.md
diff --git a/5-animation/1-bezier-curve/bezier-car.png b/3-animation/1-bezier-curve/bezier-car.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier-car.png
rename to 3-animation/1-bezier-curve/bezier-car.png
diff --git a/5-animation/1-bezier-curve/bezier-car@2x.png b/3-animation/1-bezier-curve/bezier-car@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier-car@2x.png
rename to 3-animation/1-bezier-curve/bezier-car@2x.png
diff --git a/5-animation/1-bezier-curve/bezier-letter.png b/3-animation/1-bezier-curve/bezier-letter.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier-letter.png
rename to 3-animation/1-bezier-curve/bezier-letter.png
diff --git a/5-animation/1-bezier-curve/bezier-letter@2x.png b/3-animation/1-bezier-curve/bezier-letter@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier-letter@2x.png
rename to 3-animation/1-bezier-curve/bezier-letter@2x.png
diff --git a/5-animation/1-bezier-curve/bezier-vase.png b/3-animation/1-bezier-curve/bezier-vase.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier-vase.png
rename to 3-animation/1-bezier-curve/bezier-vase.png
diff --git a/5-animation/1-bezier-curve/bezier-vase@2x.png b/3-animation/1-bezier-curve/bezier-vase@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier-vase@2x.png
rename to 3-animation/1-bezier-curve/bezier-vase@2x.png
diff --git a/5-animation/1-bezier-curve/bezier2.png b/3-animation/1-bezier-curve/bezier2.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier2.png
rename to 3-animation/1-bezier-curve/bezier2.png
diff --git a/5-animation/1-bezier-curve/bezier2@2x.png b/3-animation/1-bezier-curve/bezier2@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier2@2x.png
rename to 3-animation/1-bezier-curve/bezier2@2x.png
diff --git a/5-animation/1-bezier-curve/bezier3-draw1.png b/3-animation/1-bezier-curve/bezier3-draw1.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3-draw1.png
rename to 3-animation/1-bezier-curve/bezier3-draw1.png
diff --git a/5-animation/1-bezier-curve/bezier3-draw1@2x.png b/3-animation/1-bezier-curve/bezier3-draw1@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3-draw1@2x.png
rename to 3-animation/1-bezier-curve/bezier3-draw1@2x.png
diff --git a/5-animation/1-bezier-curve/bezier3-draw2.png b/3-animation/1-bezier-curve/bezier3-draw2.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3-draw2.png
rename to 3-animation/1-bezier-curve/bezier3-draw2.png
diff --git a/5-animation/1-bezier-curve/bezier3-draw2@2x.png b/3-animation/1-bezier-curve/bezier3-draw2@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3-draw2@2x.png
rename to 3-animation/1-bezier-curve/bezier3-draw2@2x.png
diff --git a/5-animation/1-bezier-curve/bezier3-e.png b/3-animation/1-bezier-curve/bezier3-e.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3-e.png
rename to 3-animation/1-bezier-curve/bezier3-e.png
diff --git a/5-animation/1-bezier-curve/bezier3-e@2x.png b/3-animation/1-bezier-curve/bezier3-e@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3-e@2x.png
rename to 3-animation/1-bezier-curve/bezier3-e@2x.png
diff --git a/5-animation/1-bezier-curve/bezier3.png b/3-animation/1-bezier-curve/bezier3.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3.png
rename to 3-animation/1-bezier-curve/bezier3.png
diff --git a/5-animation/1-bezier-curve/bezier3@2x.png b/3-animation/1-bezier-curve/bezier3@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier3@2x.png
rename to 3-animation/1-bezier-curve/bezier3@2x.png
diff --git a/5-animation/1-bezier-curve/bezier4-e.png b/3-animation/1-bezier-curve/bezier4-e.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier4-e.png
rename to 3-animation/1-bezier-curve/bezier4-e.png
diff --git a/5-animation/1-bezier-curve/bezier4-e@2x.png b/3-animation/1-bezier-curve/bezier4-e@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier4-e@2x.png
rename to 3-animation/1-bezier-curve/bezier4-e@2x.png
diff --git a/5-animation/1-bezier-curve/bezier4.png b/3-animation/1-bezier-curve/bezier4.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier4.png
rename to 3-animation/1-bezier-curve/bezier4.png
diff --git a/5-animation/1-bezier-curve/bezier4@2x.png b/3-animation/1-bezier-curve/bezier4@2x.png
similarity index 100%
rename from 5-animation/1-bezier-curve/bezier4@2x.png
rename to 3-animation/1-bezier-curve/bezier4@2x.png
diff --git a/5-animation/1-bezier-curve/demo.svg b/3-animation/1-bezier-curve/demo.svg
similarity index 100%
rename from 5-animation/1-bezier-curve/demo.svg
rename to 3-animation/1-bezier-curve/demo.svg
diff --git a/5-animation/1-bezier-curve/pause.png b/3-animation/1-bezier-curve/pause.png
similarity index 100%
rename from 5-animation/1-bezier-curve/pause.png
rename to 3-animation/1-bezier-curve/pause.png
diff --git a/5-animation/1-bezier-curve/play.png b/3-animation/1-bezier-curve/play.png
similarity index 100%
rename from 5-animation/1-bezier-curve/play.png
rename to 3-animation/1-bezier-curve/play.png
diff --git a/5-animation/2-css-animations/1-animate-logo-css/solution.md b/3-animation/2-css-animations/1-animate-logo-css/solution.md
similarity index 100%
rename from 5-animation/2-css-animations/1-animate-logo-css/solution.md
rename to 3-animation/2-css-animations/1-animate-logo-css/solution.md
diff --git a/5-animation/2-css-animations/1-animate-logo-css/solution.view/index.html b/3-animation/2-css-animations/1-animate-logo-css/solution.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/1-animate-logo-css/solution.view/index.html
rename to 3-animation/2-css-animations/1-animate-logo-css/solution.view/index.html
diff --git a/5-animation/2-css-animations/1-animate-logo-css/source.view/index.html b/3-animation/2-css-animations/1-animate-logo-css/source.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/1-animate-logo-css/source.view/index.html
rename to 3-animation/2-css-animations/1-animate-logo-css/source.view/index.html
diff --git a/5-animation/2-css-animations/1-animate-logo-css/task.md b/3-animation/2-css-animations/1-animate-logo-css/task.md
similarity index 100%
rename from 5-animation/2-css-animations/1-animate-logo-css/task.md
rename to 3-animation/2-css-animations/1-animate-logo-css/task.md
diff --git a/5-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up.png b/3-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up.png
similarity index 100%
rename from 5-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up.png
rename to 3-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up.png
diff --git a/5-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up@2x.png b/3-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up@2x.png
rename to 3-animation/2-css-animations/2-animate-logo-bezier-css/bezier-up@2x.png
diff --git a/5-animation/2-css-animations/2-animate-logo-bezier-css/solution.md b/3-animation/2-css-animations/2-animate-logo-bezier-css/solution.md
similarity index 100%
rename from 5-animation/2-css-animations/2-animate-logo-bezier-css/solution.md
rename to 3-animation/2-css-animations/2-animate-logo-bezier-css/solution.md
diff --git a/5-animation/2-css-animations/2-animate-logo-bezier-css/solution.view/index.html b/3-animation/2-css-animations/2-animate-logo-bezier-css/solution.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/2-animate-logo-bezier-css/solution.view/index.html
rename to 3-animation/2-css-animations/2-animate-logo-bezier-css/solution.view/index.html
diff --git a/5-animation/2-css-animations/2-animate-logo-bezier-css/task.md b/3-animation/2-css-animations/2-animate-logo-bezier-css/task.md
similarity index 100%
rename from 5-animation/2-css-animations/2-animate-logo-bezier-css/task.md
rename to 3-animation/2-css-animations/2-animate-logo-bezier-css/task.md
diff --git a/5-animation/2-css-animations/3-animate-circle/solution.md b/3-animation/2-css-animations/3-animate-circle/solution.md
similarity index 100%
rename from 5-animation/2-css-animations/3-animate-circle/solution.md
rename to 3-animation/2-css-animations/3-animate-circle/solution.md
diff --git a/5-animation/2-css-animations/3-animate-circle/solution.view/index.html b/3-animation/2-css-animations/3-animate-circle/solution.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/3-animate-circle/solution.view/index.html
rename to 3-animation/2-css-animations/3-animate-circle/solution.view/index.html
diff --git a/5-animation/2-css-animations/3-animate-circle/source.view/index.html b/3-animation/2-css-animations/3-animate-circle/source.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/3-animate-circle/source.view/index.html
rename to 3-animation/2-css-animations/3-animate-circle/source.view/index.html
diff --git a/5-animation/2-css-animations/3-animate-circle/task.md b/3-animation/2-css-animations/3-animate-circle/task.md
similarity index 100%
rename from 5-animation/2-css-animations/3-animate-circle/task.md
rename to 3-animation/2-css-animations/3-animate-circle/task.md
diff --git a/5-animation/2-css-animations/article.md b/3-animation/2-css-animations/article.md
similarity index 100%
rename from 5-animation/2-css-animations/article.md
rename to 3-animation/2-css-animations/article.md
diff --git a/5-animation/2-css-animations/bezier-linear.png b/3-animation/2-css-animations/bezier-linear.png
similarity index 100%
rename from 5-animation/2-css-animations/bezier-linear.png
rename to 3-animation/2-css-animations/bezier-linear.png
diff --git a/5-animation/2-css-animations/bezier-linear@2x.png b/3-animation/2-css-animations/bezier-linear@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/bezier-linear@2x.png
rename to 3-animation/2-css-animations/bezier-linear@2x.png
diff --git a/5-animation/2-css-animations/bezier-train-over.png b/3-animation/2-css-animations/bezier-train-over.png
similarity index 100%
rename from 5-animation/2-css-animations/bezier-train-over.png
rename to 3-animation/2-css-animations/bezier-train-over.png
diff --git a/5-animation/2-css-animations/bezier-train-over@2x.png b/3-animation/2-css-animations/bezier-train-over@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/bezier-train-over@2x.png
rename to 3-animation/2-css-animations/bezier-train-over@2x.png
diff --git a/5-animation/2-css-animations/boat.view/index.html b/3-animation/2-css-animations/boat.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/boat.view/index.html
rename to 3-animation/2-css-animations/boat.view/index.html
diff --git a/5-animation/2-css-animations/boat.view/style.css b/3-animation/2-css-animations/boat.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/boat.view/style.css
rename to 3-animation/2-css-animations/boat.view/style.css
diff --git a/5-animation/2-css-animations/digits-negative-delay.view/index.html b/3-animation/2-css-animations/digits-negative-delay.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/digits-negative-delay.view/index.html
rename to 3-animation/2-css-animations/digits-negative-delay.view/index.html
diff --git a/5-animation/2-css-animations/digits-negative-delay.view/script.js b/3-animation/2-css-animations/digits-negative-delay.view/script.js
similarity index 100%
rename from 5-animation/2-css-animations/digits-negative-delay.view/script.js
rename to 3-animation/2-css-animations/digits-negative-delay.view/script.js
diff --git a/5-animation/2-css-animations/digits-negative-delay.view/style.css b/3-animation/2-css-animations/digits-negative-delay.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/digits-negative-delay.view/style.css
rename to 3-animation/2-css-animations/digits-negative-delay.view/style.css
diff --git a/5-animation/2-css-animations/digits.view/index.html b/3-animation/2-css-animations/digits.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/digits.view/index.html
rename to 3-animation/2-css-animations/digits.view/index.html
diff --git a/5-animation/2-css-animations/digits.view/script.js b/3-animation/2-css-animations/digits.view/script.js
similarity index 100%
rename from 5-animation/2-css-animations/digits.view/script.js
rename to 3-animation/2-css-animations/digits.view/script.js
diff --git a/5-animation/2-css-animations/digits.view/style.css b/3-animation/2-css-animations/digits.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/digits.view/style.css
rename to 3-animation/2-css-animations/digits.view/style.css
diff --git a/5-animation/2-css-animations/ease-in-out.png b/3-animation/2-css-animations/ease-in-out.png
similarity index 100%
rename from 5-animation/2-css-animations/ease-in-out.png
rename to 3-animation/2-css-animations/ease-in-out.png
diff --git a/5-animation/2-css-animations/ease-in-out@2x.png b/3-animation/2-css-animations/ease-in-out@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/ease-in-out@2x.png
rename to 3-animation/2-css-animations/ease-in-out@2x.png
diff --git a/5-animation/2-css-animations/ease-in.png b/3-animation/2-css-animations/ease-in.png
similarity index 100%
rename from 5-animation/2-css-animations/ease-in.png
rename to 3-animation/2-css-animations/ease-in.png
diff --git a/5-animation/2-css-animations/ease-in@2x.png b/3-animation/2-css-animations/ease-in@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/ease-in@2x.png
rename to 3-animation/2-css-animations/ease-in@2x.png
diff --git a/5-animation/2-css-animations/ease-out.png b/3-animation/2-css-animations/ease-out.png
similarity index 100%
rename from 5-animation/2-css-animations/ease-out.png
rename to 3-animation/2-css-animations/ease-out.png
diff --git a/5-animation/2-css-animations/ease-out@2x.png b/3-animation/2-css-animations/ease-out@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/ease-out@2x.png
rename to 3-animation/2-css-animations/ease-out@2x.png
diff --git a/5-animation/2-css-animations/ease.png b/3-animation/2-css-animations/ease.png
similarity index 100%
rename from 5-animation/2-css-animations/ease.png
rename to 3-animation/2-css-animations/ease.png
diff --git a/5-animation/2-css-animations/ease@2x.png b/3-animation/2-css-animations/ease@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/ease@2x.png
rename to 3-animation/2-css-animations/ease@2x.png
diff --git a/5-animation/2-css-animations/step-end.view/index.html b/3-animation/2-css-animations/step-end.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/step-end.view/index.html
rename to 3-animation/2-css-animations/step-end.view/index.html
diff --git a/5-animation/2-css-animations/step-end.view/style.css b/3-animation/2-css-animations/step-end.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/step-end.view/style.css
rename to 3-animation/2-css-animations/step-end.view/style.css
diff --git a/5-animation/2-css-animations/step.view/index.html b/3-animation/2-css-animations/step.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/step.view/index.html
rename to 3-animation/2-css-animations/step.view/index.html
diff --git a/5-animation/2-css-animations/step.view/style.css b/3-animation/2-css-animations/step.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/step.view/style.css
rename to 3-animation/2-css-animations/step.view/style.css
diff --git a/5-animation/2-css-animations/train-curve.png b/3-animation/2-css-animations/train-curve.png
similarity index 100%
rename from 5-animation/2-css-animations/train-curve.png
rename to 3-animation/2-css-animations/train-curve.png
diff --git a/5-animation/2-css-animations/train-curve@2x.png b/3-animation/2-css-animations/train-curve@2x.png
similarity index 100%
rename from 5-animation/2-css-animations/train-curve@2x.png
rename to 3-animation/2-css-animations/train-curve@2x.png
diff --git a/5-animation/2-css-animations/train-linear.view/index.html b/3-animation/2-css-animations/train-linear.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/train-linear.view/index.html
rename to 3-animation/2-css-animations/train-linear.view/index.html
diff --git a/5-animation/2-css-animations/train-linear.view/style.css b/3-animation/2-css-animations/train-linear.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/train-linear.view/style.css
rename to 3-animation/2-css-animations/train-linear.view/style.css
diff --git a/5-animation/2-css-animations/train-over.view/index.html b/3-animation/2-css-animations/train-over.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/train-over.view/index.html
rename to 3-animation/2-css-animations/train-over.view/index.html
diff --git a/5-animation/2-css-animations/train-over.view/style.css b/3-animation/2-css-animations/train-over.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/train-over.view/style.css
rename to 3-animation/2-css-animations/train-over.view/style.css
diff --git a/5-animation/2-css-animations/train.view/index.html b/3-animation/2-css-animations/train.view/index.html
similarity index 100%
rename from 5-animation/2-css-animations/train.view/index.html
rename to 3-animation/2-css-animations/train.view/index.html
diff --git a/5-animation/2-css-animations/train.view/style.css b/3-animation/2-css-animations/train.view/style.css
similarity index 100%
rename from 5-animation/2-css-animations/train.view/style.css
rename to 3-animation/2-css-animations/train.view/style.css
diff --git a/5-animation/3-js-animation/1-animate-ball/solution.md b/3-animation/3-js-animation/1-animate-ball/solution.md
similarity index 100%
rename from 5-animation/3-js-animation/1-animate-ball/solution.md
rename to 3-animation/3-js-animation/1-animate-ball/solution.md
diff --git a/5-animation/3-js-animation/1-animate-ball/solution.view/index.html b/3-animation/3-js-animation/1-animate-ball/solution.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/1-animate-ball/solution.view/index.html
rename to 3-animation/3-js-animation/1-animate-ball/solution.view/index.html
diff --git a/5-animation/3-js-animation/1-animate-ball/solution.view/style.css b/3-animation/3-js-animation/1-animate-ball/solution.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/1-animate-ball/solution.view/style.css
rename to 3-animation/3-js-animation/1-animate-ball/solution.view/style.css
diff --git a/5-animation/3-js-animation/1-animate-ball/source.view/index.html b/3-animation/3-js-animation/1-animate-ball/source.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/1-animate-ball/source.view/index.html
rename to 3-animation/3-js-animation/1-animate-ball/source.view/index.html
diff --git a/5-animation/3-js-animation/1-animate-ball/source.view/style.css b/3-animation/3-js-animation/1-animate-ball/source.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/1-animate-ball/source.view/style.css
rename to 3-animation/3-js-animation/1-animate-ball/source.view/style.css
diff --git a/5-animation/3-js-animation/1-animate-ball/task.md b/3-animation/3-js-animation/1-animate-ball/task.md
similarity index 100%
rename from 5-animation/3-js-animation/1-animate-ball/task.md
rename to 3-animation/3-js-animation/1-animate-ball/task.md
diff --git a/5-animation/3-js-animation/2-animate-ball-hops/solution.md b/3-animation/3-js-animation/2-animate-ball-hops/solution.md
similarity index 100%
rename from 5-animation/3-js-animation/2-animate-ball-hops/solution.md
rename to 3-animation/3-js-animation/2-animate-ball-hops/solution.md
diff --git a/5-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html b/3-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html
rename to 3-animation/3-js-animation/2-animate-ball-hops/solution.view/index.html
diff --git a/5-animation/3-js-animation/2-animate-ball-hops/solution.view/style.css b/3-animation/3-js-animation/2-animate-ball-hops/solution.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/2-animate-ball-hops/solution.view/style.css
rename to 3-animation/3-js-animation/2-animate-ball-hops/solution.view/style.css
diff --git a/5-animation/3-js-animation/2-animate-ball-hops/task.md b/3-animation/3-js-animation/2-animate-ball-hops/task.md
similarity index 100%
rename from 5-animation/3-js-animation/2-animate-ball-hops/task.md
rename to 3-animation/3-js-animation/2-animate-ball-hops/task.md
diff --git a/5-animation/3-js-animation/article.md b/3-animation/3-js-animation/article.md
similarity index 100%
rename from 5-animation/3-js-animation/article.md
rename to 3-animation/3-js-animation/article.md
diff --git a/5-animation/3-js-animation/back.png b/3-animation/3-js-animation/back.png
similarity index 100%
rename from 5-animation/3-js-animation/back.png
rename to 3-animation/3-js-animation/back.png
diff --git a/5-animation/3-js-animation/back.view/index.html b/3-animation/3-js-animation/back.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/back.view/index.html
rename to 3-animation/3-js-animation/back.view/index.html
diff --git a/5-animation/3-js-animation/back.view/style.css b/3-animation/3-js-animation/back.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/back.view/style.css
rename to 3-animation/3-js-animation/back.view/style.css
diff --git a/5-animation/3-js-animation/back@2x.png b/3-animation/3-js-animation/back@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/back@2x.png
rename to 3-animation/3-js-animation/back@2x.png
diff --git a/5-animation/3-js-animation/bezier-linear.png b/3-animation/3-js-animation/bezier-linear.png
similarity index 100%
rename from 5-animation/3-js-animation/bezier-linear.png
rename to 3-animation/3-js-animation/bezier-linear.png
diff --git a/5-animation/3-js-animation/bezier-linear@2x.png b/3-animation/3-js-animation/bezier-linear@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/bezier-linear@2x.png
rename to 3-animation/3-js-animation/bezier-linear@2x.png
diff --git a/5-animation/3-js-animation/bounce-easeinout.view/index.html b/3-animation/3-js-animation/bounce-easeinout.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/bounce-easeinout.view/index.html
rename to 3-animation/3-js-animation/bounce-easeinout.view/index.html
diff --git a/5-animation/3-js-animation/bounce-easeinout.view/style.css b/3-animation/3-js-animation/bounce-easeinout.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/bounce-easeinout.view/style.css
rename to 3-animation/3-js-animation/bounce-easeinout.view/style.css
diff --git a/5-animation/3-js-animation/bounce-easeout.view/index.html b/3-animation/3-js-animation/bounce-easeout.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/bounce-easeout.view/index.html
rename to 3-animation/3-js-animation/bounce-easeout.view/index.html
diff --git a/5-animation/3-js-animation/bounce-easeout.view/style.css b/3-animation/3-js-animation/bounce-easeout.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/bounce-easeout.view/style.css
rename to 3-animation/3-js-animation/bounce-easeout.view/style.css
diff --git a/5-animation/3-js-animation/bounce-inout.png b/3-animation/3-js-animation/bounce-inout.png
similarity index 100%
rename from 5-animation/3-js-animation/bounce-inout.png
rename to 3-animation/3-js-animation/bounce-inout.png
diff --git a/5-animation/3-js-animation/bounce-inout@2x.png b/3-animation/3-js-animation/bounce-inout@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/bounce-inout@2x.png
rename to 3-animation/3-js-animation/bounce-inout@2x.png
diff --git a/5-animation/3-js-animation/bounce.view/index.html b/3-animation/3-js-animation/bounce.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/bounce.view/index.html
rename to 3-animation/3-js-animation/bounce.view/index.html
diff --git a/5-animation/3-js-animation/bounce.view/style.css b/3-animation/3-js-animation/bounce.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/bounce.view/style.css
rename to 3-animation/3-js-animation/bounce.view/style.css
diff --git a/5-animation/3-js-animation/circ-ease.png b/3-animation/3-js-animation/circ-ease.png
similarity index 100%
rename from 5-animation/3-js-animation/circ-ease.png
rename to 3-animation/3-js-animation/circ-ease.png
diff --git a/5-animation/3-js-animation/circ-ease@2x.png b/3-animation/3-js-animation/circ-ease@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/circ-ease@2x.png
rename to 3-animation/3-js-animation/circ-ease@2x.png
diff --git a/5-animation/3-js-animation/circ.png b/3-animation/3-js-animation/circ.png
similarity index 100%
rename from 5-animation/3-js-animation/circ.png
rename to 3-animation/3-js-animation/circ.png
diff --git a/5-animation/3-js-animation/circ.view/index.html b/3-animation/3-js-animation/circ.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/circ.view/index.html
rename to 3-animation/3-js-animation/circ.view/index.html
diff --git a/5-animation/3-js-animation/circ.view/style.css b/3-animation/3-js-animation/circ.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/circ.view/style.css
rename to 3-animation/3-js-animation/circ.view/style.css
diff --git a/5-animation/3-js-animation/circ@2x.png b/3-animation/3-js-animation/circ@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/circ@2x.png
rename to 3-animation/3-js-animation/circ@2x.png
diff --git a/5-animation/3-js-animation/elastic.png b/3-animation/3-js-animation/elastic.png
similarity index 100%
rename from 5-animation/3-js-animation/elastic.png
rename to 3-animation/3-js-animation/elastic.png
diff --git a/5-animation/3-js-animation/elastic.view/index.html b/3-animation/3-js-animation/elastic.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/elastic.view/index.html
rename to 3-animation/3-js-animation/elastic.view/index.html
diff --git a/5-animation/3-js-animation/elastic.view/style.css b/3-animation/3-js-animation/elastic.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/elastic.view/style.css
rename to 3-animation/3-js-animation/elastic.view/style.css
diff --git a/5-animation/3-js-animation/elastic@2x.png b/3-animation/3-js-animation/elastic@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/elastic@2x.png
rename to 3-animation/3-js-animation/elastic@2x.png
diff --git a/5-animation/3-js-animation/linear.png b/3-animation/3-js-animation/linear.png
similarity index 100%
rename from 5-animation/3-js-animation/linear.png
rename to 3-animation/3-js-animation/linear.png
diff --git a/5-animation/3-js-animation/linear@2x.png b/3-animation/3-js-animation/linear@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/linear@2x.png
rename to 3-animation/3-js-animation/linear@2x.png
diff --git a/5-animation/3-js-animation/move-raf.view/index.html b/3-animation/3-js-animation/move-raf.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/move-raf.view/index.html
rename to 3-animation/3-js-animation/move-raf.view/index.html
diff --git a/5-animation/3-js-animation/move.view/index.html b/3-animation/3-js-animation/move.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/move.view/index.html
rename to 3-animation/3-js-animation/move.view/index.html
diff --git a/5-animation/3-js-animation/quad.png b/3-animation/3-js-animation/quad.png
similarity index 100%
rename from 5-animation/3-js-animation/quad.png
rename to 3-animation/3-js-animation/quad.png
diff --git a/5-animation/3-js-animation/quad.view/index.html b/3-animation/3-js-animation/quad.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/quad.view/index.html
rename to 3-animation/3-js-animation/quad.view/index.html
diff --git a/5-animation/3-js-animation/quad.view/style.css b/3-animation/3-js-animation/quad.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/quad.view/style.css
rename to 3-animation/3-js-animation/quad.view/style.css
diff --git a/5-animation/3-js-animation/quad@2x.png b/3-animation/3-js-animation/quad@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/quad@2x.png
rename to 3-animation/3-js-animation/quad@2x.png
diff --git a/5-animation/3-js-animation/quint.png b/3-animation/3-js-animation/quint.png
similarity index 100%
rename from 5-animation/3-js-animation/quint.png
rename to 3-animation/3-js-animation/quint.png
diff --git a/5-animation/3-js-animation/quint.view/index.html b/3-animation/3-js-animation/quint.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/quint.view/index.html
rename to 3-animation/3-js-animation/quint.view/index.html
diff --git a/5-animation/3-js-animation/quint.view/style.css b/3-animation/3-js-animation/quint.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/quint.view/style.css
rename to 3-animation/3-js-animation/quint.view/style.css
diff --git a/5-animation/3-js-animation/quint@2x.png b/3-animation/3-js-animation/quint@2x.png
similarity index 100%
rename from 5-animation/3-js-animation/quint@2x.png
rename to 3-animation/3-js-animation/quint@2x.png
diff --git a/5-animation/3-js-animation/text.view/index.html b/3-animation/3-js-animation/text.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/text.view/index.html
rename to 3-animation/3-js-animation/text.view/index.html
diff --git a/5-animation/3-js-animation/text.view/style.css b/3-animation/3-js-animation/text.view/style.css
similarity index 100%
rename from 5-animation/3-js-animation/text.view/style.css
rename to 3-animation/3-js-animation/text.view/style.css
diff --git a/5-animation/3-js-animation/width.view/animate.js b/3-animation/3-js-animation/width.view/animate.js
similarity index 100%
rename from 5-animation/3-js-animation/width.view/animate.js
rename to 3-animation/3-js-animation/width.view/animate.js
diff --git a/5-animation/3-js-animation/width.view/index.html b/3-animation/3-js-animation/width.view/index.html
similarity index 100%
rename from 5-animation/3-js-animation/width.view/index.html
rename to 3-animation/3-js-animation/width.view/index.html
diff --git a/5-animation/index.md b/3-animation/index.md
similarity index 100%
rename from 5-animation/index.md
rename to 3-animation/index.md
diff --git a/7-frames-and-windows/01-popup-windows/article.md b/4-frames-and-windows/01-popup-windows/article.md
similarity index 100%
rename from 7-frames-and-windows/01-popup-windows/article.md
rename to 4-frames-and-windows/01-popup-windows/article.md
diff --git a/7-frames-and-windows/03-cross-window-communication/article.md b/4-frames-and-windows/03-cross-window-communication/article.md
similarity index 100%
rename from 7-frames-and-windows/03-cross-window-communication/article.md
rename to 4-frames-and-windows/03-cross-window-communication/article.md
diff --git a/7-frames-and-windows/03-cross-window-communication/postmessage.view/iframe.html b/4-frames-and-windows/03-cross-window-communication/postmessage.view/iframe.html
similarity index 100%
rename from 7-frames-and-windows/03-cross-window-communication/postmessage.view/iframe.html
rename to 4-frames-and-windows/03-cross-window-communication/postmessage.view/iframe.html
diff --git a/7-frames-and-windows/03-cross-window-communication/postmessage.view/index.html b/4-frames-and-windows/03-cross-window-communication/postmessage.view/index.html
similarity index 100%
rename from 7-frames-and-windows/03-cross-window-communication/postmessage.view/index.html
rename to 4-frames-and-windows/03-cross-window-communication/postmessage.view/index.html
diff --git a/7-frames-and-windows/03-cross-window-communication/sandbox.view/index.html b/4-frames-and-windows/03-cross-window-communication/sandbox.view/index.html
similarity index 100%
rename from 7-frames-and-windows/03-cross-window-communication/sandbox.view/index.html
rename to 4-frames-and-windows/03-cross-window-communication/sandbox.view/index.html
diff --git a/7-frames-and-windows/03-cross-window-communication/sandbox.view/sandboxed.html b/4-frames-and-windows/03-cross-window-communication/sandbox.view/sandboxed.html
similarity index 100%
rename from 7-frames-and-windows/03-cross-window-communication/sandbox.view/sandboxed.html
rename to 4-frames-and-windows/03-cross-window-communication/sandbox.view/sandboxed.html
diff --git a/7-frames-and-windows/06-clickjacking/article.md b/4-frames-and-windows/06-clickjacking/article.md
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/article.md
rename to 4-frames-and-windows/06-clickjacking/article.md
diff --git a/7-frames-and-windows/06-clickjacking/clickjacking-visible.view/facebook.html b/4-frames-and-windows/06-clickjacking/clickjacking-visible.view/facebook.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/clickjacking-visible.view/facebook.html
rename to 4-frames-and-windows/06-clickjacking/clickjacking-visible.view/facebook.html
diff --git a/7-frames-and-windows/06-clickjacking/clickjacking-visible.view/index.html b/4-frames-and-windows/06-clickjacking/clickjacking-visible.view/index.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/clickjacking-visible.view/index.html
rename to 4-frames-and-windows/06-clickjacking/clickjacking-visible.view/index.html
diff --git a/7-frames-and-windows/06-clickjacking/clickjacking.view/facebook.html b/4-frames-and-windows/06-clickjacking/clickjacking.view/facebook.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/clickjacking.view/facebook.html
rename to 4-frames-and-windows/06-clickjacking/clickjacking.view/facebook.html
diff --git a/7-frames-and-windows/06-clickjacking/clickjacking.view/index.html b/4-frames-and-windows/06-clickjacking/clickjacking.view/index.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/clickjacking.view/index.html
rename to 4-frames-and-windows/06-clickjacking/clickjacking.view/index.html
diff --git a/7-frames-and-windows/06-clickjacking/protector.view/iframe.html b/4-frames-and-windows/06-clickjacking/protector.view/iframe.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/protector.view/iframe.html
rename to 4-frames-and-windows/06-clickjacking/protector.view/iframe.html
diff --git a/7-frames-and-windows/06-clickjacking/protector.view/index.html b/4-frames-and-windows/06-clickjacking/protector.view/index.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/protector.view/index.html
rename to 4-frames-and-windows/06-clickjacking/protector.view/index.html
diff --git a/7-frames-and-windows/06-clickjacking/top-location.view/iframe.html b/4-frames-and-windows/06-clickjacking/top-location.view/iframe.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/top-location.view/iframe.html
rename to 4-frames-and-windows/06-clickjacking/top-location.view/iframe.html
diff --git a/7-frames-and-windows/06-clickjacking/top-location.view/index.html b/4-frames-and-windows/06-clickjacking/top-location.view/index.html
similarity index 100%
rename from 7-frames-and-windows/06-clickjacking/top-location.view/index.html
rename to 4-frames-and-windows/06-clickjacking/top-location.view/index.html
diff --git a/7-frames-and-windows/index.md b/4-frames-and-windows/index.md
similarity index 100%
rename from 7-frames-and-windows/index.md
rename to 4-frames-and-windows/index.md
diff --git a/10-regular-expressions/01-regexp-introduction/article.md b/5-regular-expressions/01-regexp-introduction/article.md
similarity index 100%
rename from 10-regular-expressions/01-regexp-introduction/article.md
rename to 5-regular-expressions/01-regexp-introduction/article.md
diff --git a/10-regular-expressions/02-regexp-methods/article.md b/5-regular-expressions/02-regexp-methods/article.md
similarity index 100%
rename from 10-regular-expressions/02-regexp-methods/article.md
rename to 5-regular-expressions/02-regexp-methods/article.md
diff --git a/10-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/solution.md b/5-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/solution.md
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/solution.md
rename to 5-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/solution.md
diff --git a/10-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/task.md b/5-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/task.md
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/task.md
rename to 5-regular-expressions/03-regexp-character-classes/1-find-time-hh-mm/task.md
diff --git a/10-regular-expressions/03-regexp-character-classes/article.md b/5-regular-expressions/03-regexp-character-classes/article.md
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/article.md
rename to 5-regular-expressions/03-regexp-character-classes/article.md
diff --git a/10-regular-expressions/03-regexp-character-classes/hello-java-boundaries.png b/5-regular-expressions/03-regexp-character-classes/hello-java-boundaries.png
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/hello-java-boundaries.png
rename to 5-regular-expressions/03-regexp-character-classes/hello-java-boundaries.png
diff --git a/10-regular-expressions/03-regexp-character-classes/hello-java-boundaries@2x.png b/5-regular-expressions/03-regexp-character-classes/hello-java-boundaries@2x.png
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/hello-java-boundaries@2x.png
rename to 5-regular-expressions/03-regexp-character-classes/hello-java-boundaries@2x.png
diff --git a/10-regular-expressions/03-regexp-character-classes/love-html5-classes.png b/5-regular-expressions/03-regexp-character-classes/love-html5-classes.png
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/love-html5-classes.png
rename to 5-regular-expressions/03-regexp-character-classes/love-html5-classes.png
diff --git a/10-regular-expressions/03-regexp-character-classes/love-html5-classes@2x.png b/5-regular-expressions/03-regexp-character-classes/love-html5-classes@2x.png
similarity index 100%
rename from 10-regular-expressions/03-regexp-character-classes/love-html5-classes@2x.png
rename to 5-regular-expressions/03-regexp-character-classes/love-html5-classes@2x.png
diff --git a/10-regular-expressions/04-regexp-escaping/article.md b/5-regular-expressions/04-regexp-escaping/article.md
similarity index 100%
rename from 10-regular-expressions/04-regexp-escaping/article.md
rename to 5-regular-expressions/04-regexp-escaping/article.md
diff --git a/10-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/solution.md b/5-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/solution.md
similarity index 100%
rename from 10-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/solution.md
rename to 5-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/solution.md
diff --git a/10-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/task.md b/5-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/task.md
similarity index 100%
rename from 10-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/task.md
rename to 5-regular-expressions/05-regexp-character-sets-and-ranges/1-find-range-1/task.md
diff --git a/10-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/solution.md b/5-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/solution.md
similarity index 100%
rename from 10-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/solution.md
rename to 5-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/solution.md
diff --git a/10-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/task.md b/5-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/task.md
similarity index 100%
rename from 10-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/task.md
rename to 5-regular-expressions/05-regexp-character-sets-and-ranges/2-find-time-2-formats/task.md
diff --git a/10-regular-expressions/05-regexp-character-sets-and-ranges/article.md b/5-regular-expressions/05-regexp-character-sets-and-ranges/article.md
similarity index 100%
rename from 10-regular-expressions/05-regexp-character-sets-and-ranges/article.md
rename to 5-regular-expressions/05-regexp-character-sets-and-ranges/article.md
diff --git a/10-regular-expressions/06-regexp-unicode/article.md b/5-regular-expressions/06-regexp-unicode/article.md
similarity index 100%
rename from 10-regular-expressions/06-regexp-unicode/article.md
rename to 5-regular-expressions/06-regexp-unicode/article.md
diff --git a/10-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/solution.md b/5-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/solution.md
similarity index 100%
rename from 10-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/solution.md
rename to 5-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/solution.md
diff --git a/10-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/task.md b/5-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/task.md
similarity index 100%
rename from 10-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/task.md
rename to 5-regular-expressions/07-regexp-quantifiers/1-find-text-manydots/task.md
diff --git a/10-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/solution.md b/5-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/solution.md
similarity index 100%
rename from 10-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/solution.md
rename to 5-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/solution.md
diff --git a/10-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/task.md b/5-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/task.md
similarity index 100%
rename from 10-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/task.md
rename to 5-regular-expressions/07-regexp-quantifiers/2-find-html-colors-6hex/task.md
diff --git a/10-regular-expressions/07-regexp-quantifiers/article.md b/5-regular-expressions/07-regexp-quantifiers/article.md
similarity index 100%
rename from 10-regular-expressions/07-regexp-quantifiers/article.md
rename to 5-regular-expressions/07-regexp-quantifiers/article.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/solution.md b/5-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/solution.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/solution.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/solution.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/task.md b/5-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/task.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/task.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/1-lazy-greedy/task.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/solution.md b/5-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/solution.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/solution.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/solution.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/task.md b/5-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/task.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/task.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/3-find-html-comments/task.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/solution.md b/5-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/solution.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/solution.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/solution.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/task.md b/5-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/task.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/task.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/4-find-html-tags-greedy-lazy/task.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/article.md b/5-regular-expressions/08-regexp-greedy-and-lazy/article.md
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/article.md
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/article.md
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy1@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy2@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy3@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy4@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy5@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_greedy6@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy3@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy4@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy5@2x.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6.png
diff --git a/10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6@2x.png b/5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6@2x.png
similarity index 100%
rename from 10-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6@2x.png
rename to 5-regular-expressions/08-regexp-greedy-and-lazy/witch_lazy6@2x.png
diff --git a/10-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/solution.md b/5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/solution.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/solution.md
rename to 5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/solution.md
diff --git a/10-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md b/5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md
rename to 5-regular-expressions/09-regexp-groups/1-find-webcolor-3-or-6/task.md
diff --git a/10-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md b/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md
rename to 5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/solution.md
diff --git a/10-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md b/5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md
rename to 5-regular-expressions/09-regexp-groups/3-find-decimal-positive-numbers/task.md
diff --git a/10-regular-expressions/09-regexp-groups/4-find-decimal-numbers/solution.md b/5-regular-expressions/09-regexp-groups/4-find-decimal-numbers/solution.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/4-find-decimal-numbers/solution.md
rename to 5-regular-expressions/09-regexp-groups/4-find-decimal-numbers/solution.md
diff --git a/10-regular-expressions/09-regexp-groups/4-find-decimal-numbers/task.md b/5-regular-expressions/09-regexp-groups/4-find-decimal-numbers/task.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/4-find-decimal-numbers/task.md
rename to 5-regular-expressions/09-regexp-groups/4-find-decimal-numbers/task.md
diff --git a/10-regular-expressions/09-regexp-groups/5-parse-expression/solution.md b/5-regular-expressions/09-regexp-groups/5-parse-expression/solution.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/5-parse-expression/solution.md
rename to 5-regular-expressions/09-regexp-groups/5-parse-expression/solution.md
diff --git a/10-regular-expressions/09-regexp-groups/5-parse-expression/task.md b/5-regular-expressions/09-regexp-groups/5-parse-expression/task.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/5-parse-expression/task.md
rename to 5-regular-expressions/09-regexp-groups/5-parse-expression/task.md
diff --git a/10-regular-expressions/09-regexp-groups/article.md b/5-regular-expressions/09-regexp-groups/article.md
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/article.md
rename to 5-regular-expressions/09-regexp-groups/article.md
diff --git a/10-regular-expressions/09-regexp-groups/regexp-nested-groups.png b/5-regular-expressions/09-regexp-groups/regexp-nested-groups.png
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/regexp-nested-groups.png
rename to 5-regular-expressions/09-regexp-groups/regexp-nested-groups.png
diff --git a/10-regular-expressions/09-regexp-groups/regexp-nested-groups@2x.png b/5-regular-expressions/09-regexp-groups/regexp-nested-groups@2x.png
similarity index 100%
rename from 10-regular-expressions/09-regexp-groups/regexp-nested-groups@2x.png
rename to 5-regular-expressions/09-regexp-groups/regexp-nested-groups@2x.png
diff --git a/10-regular-expressions/10-regexp-backreferences/article.md b/5-regular-expressions/10-regexp-backreferences/article.md
similarity index 100%
rename from 10-regular-expressions/10-regexp-backreferences/article.md
rename to 5-regular-expressions/10-regexp-backreferences/article.md
diff --git a/10-regular-expressions/11-regexp-alternation/01-find-programming-language/solution.md b/5-regular-expressions/11-regexp-alternation/01-find-programming-language/solution.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/01-find-programming-language/solution.md
rename to 5-regular-expressions/11-regexp-alternation/01-find-programming-language/solution.md
diff --git a/10-regular-expressions/11-regexp-alternation/01-find-programming-language/task.md b/5-regular-expressions/11-regexp-alternation/01-find-programming-language/task.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/01-find-programming-language/task.md
rename to 5-regular-expressions/11-regexp-alternation/01-find-programming-language/task.md
diff --git a/10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/solution.md b/5-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/solution.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/solution.md
rename to 5-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/solution.md
diff --git a/10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md b/5-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md
rename to 5-regular-expressions/11-regexp-alternation/02-find-matching-bbtags/task.md
diff --git a/10-regular-expressions/11-regexp-alternation/03-match-quoted-string/solution.md b/5-regular-expressions/11-regexp-alternation/03-match-quoted-string/solution.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/03-match-quoted-string/solution.md
rename to 5-regular-expressions/11-regexp-alternation/03-match-quoted-string/solution.md
diff --git a/10-regular-expressions/11-regexp-alternation/03-match-quoted-string/task.md b/5-regular-expressions/11-regexp-alternation/03-match-quoted-string/task.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/03-match-quoted-string/task.md
rename to 5-regular-expressions/11-regexp-alternation/03-match-quoted-string/task.md
diff --git a/10-regular-expressions/11-regexp-alternation/04-match-exact-tag/solution.md b/5-regular-expressions/11-regexp-alternation/04-match-exact-tag/solution.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/04-match-exact-tag/solution.md
rename to 5-regular-expressions/11-regexp-alternation/04-match-exact-tag/solution.md
diff --git a/10-regular-expressions/11-regexp-alternation/04-match-exact-tag/task.md b/5-regular-expressions/11-regexp-alternation/04-match-exact-tag/task.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/04-match-exact-tag/task.md
rename to 5-regular-expressions/11-regexp-alternation/04-match-exact-tag/task.md
diff --git a/10-regular-expressions/11-regexp-alternation/article.md b/5-regular-expressions/11-regexp-alternation/article.md
similarity index 100%
rename from 10-regular-expressions/11-regexp-alternation/article.md
rename to 5-regular-expressions/11-regexp-alternation/article.md
diff --git a/10-regular-expressions/12-regexp-anchors/1-start-end/solution.md b/5-regular-expressions/12-regexp-anchors/1-start-end/solution.md
similarity index 100%
rename from 10-regular-expressions/12-regexp-anchors/1-start-end/solution.md
rename to 5-regular-expressions/12-regexp-anchors/1-start-end/solution.md
diff --git a/10-regular-expressions/12-regexp-anchors/1-start-end/task.md b/5-regular-expressions/12-regexp-anchors/1-start-end/task.md
similarity index 100%
rename from 10-regular-expressions/12-regexp-anchors/1-start-end/task.md
rename to 5-regular-expressions/12-regexp-anchors/1-start-end/task.md
diff --git a/10-regular-expressions/12-regexp-anchors/2-test-mac/solution.md b/5-regular-expressions/12-regexp-anchors/2-test-mac/solution.md
similarity index 100%
rename from 10-regular-expressions/12-regexp-anchors/2-test-mac/solution.md
rename to 5-regular-expressions/12-regexp-anchors/2-test-mac/solution.md
diff --git a/10-regular-expressions/12-regexp-anchors/2-test-mac/task.md b/5-regular-expressions/12-regexp-anchors/2-test-mac/task.md
similarity index 100%
rename from 10-regular-expressions/12-regexp-anchors/2-test-mac/task.md
rename to 5-regular-expressions/12-regexp-anchors/2-test-mac/task.md
diff --git a/10-regular-expressions/12-regexp-anchors/article.md b/5-regular-expressions/12-regexp-anchors/article.md
similarity index 100%
rename from 10-regular-expressions/12-regexp-anchors/article.md
rename to 5-regular-expressions/12-regexp-anchors/article.md
diff --git a/10-regular-expressions/13-regexp-multiline-mode/article.md b/5-regular-expressions/13-regexp-multiline-mode/article.md
similarity index 100%
rename from 10-regular-expressions/13-regexp-multiline-mode/article.md
rename to 5-regular-expressions/13-regexp-multiline-mode/article.md
diff --git a/10-regular-expressions/14-regexp-lookahead/article.md b/5-regular-expressions/14-regexp-lookahead/article.md
similarity index 100%
rename from 10-regular-expressions/14-regexp-lookahead/article.md
rename to 5-regular-expressions/14-regexp-lookahead/article.md
diff --git a/10-regular-expressions/15-regexp-infinite-backtracking-problem/article.md b/5-regular-expressions/15-regexp-infinite-backtracking-problem/article.md
similarity index 100%
rename from 10-regular-expressions/15-regexp-infinite-backtracking-problem/article.md
rename to 5-regular-expressions/15-regexp-infinite-backtracking-problem/article.md
diff --git a/10-regular-expressions/index.md b/5-regular-expressions/index.md
similarity index 100%
rename from 10-regular-expressions/index.md
rename to 5-regular-expressions/index.md
diff --git a/8-async/01-callbacks/01-animate-circle-callback/solution.md b/6-async/01-callbacks/01-animate-circle-callback/solution.md
similarity index 100%
rename from 8-async/01-callbacks/01-animate-circle-callback/solution.md
rename to 6-async/01-callbacks/01-animate-circle-callback/solution.md
diff --git a/8-async/01-callbacks/01-animate-circle-callback/solution.view/index.html b/6-async/01-callbacks/01-animate-circle-callback/solution.view/index.html
similarity index 100%
rename from 8-async/01-callbacks/01-animate-circle-callback/solution.view/index.html
rename to 6-async/01-callbacks/01-animate-circle-callback/solution.view/index.html
diff --git a/8-async/01-callbacks/01-animate-circle-callback/task.md b/6-async/01-callbacks/01-animate-circle-callback/task.md
similarity index 100%
rename from 8-async/01-callbacks/01-animate-circle-callback/task.md
rename to 6-async/01-callbacks/01-animate-circle-callback/task.md
diff --git a/8-async/01-callbacks/article.md b/6-async/01-callbacks/article.md
similarity index 100%
rename from 8-async/01-callbacks/article.md
rename to 6-async/01-callbacks/article.md
diff --git a/8-async/01-callbacks/callback-hell.png b/6-async/01-callbacks/callback-hell.png
similarity index 100%
rename from 8-async/01-callbacks/callback-hell.png
rename to 6-async/01-callbacks/callback-hell.png
diff --git a/8-async/01-callbacks/callback-hell@2x.png b/6-async/01-callbacks/callback-hell@2x.png
similarity index 100%
rename from 8-async/01-callbacks/callback-hell@2x.png
rename to 6-async/01-callbacks/callback-hell@2x.png
diff --git a/8-async/01-callbacks/one.js b/6-async/01-callbacks/one.js
similarity index 100%
rename from 8-async/01-callbacks/one.js
rename to 6-async/01-callbacks/one.js
diff --git a/8-async/02-promise-basics/01-re-resolve/solution.md b/6-async/02-promise-basics/01-re-resolve/solution.md
similarity index 100%
rename from 8-async/02-promise-basics/01-re-resolve/solution.md
rename to 6-async/02-promise-basics/01-re-resolve/solution.md
diff --git a/8-async/02-promise-basics/01-re-resolve/task.md b/6-async/02-promise-basics/01-re-resolve/task.md
similarity index 100%
rename from 8-async/02-promise-basics/01-re-resolve/task.md
rename to 6-async/02-promise-basics/01-re-resolve/task.md
diff --git a/8-async/02-promise-basics/02-delay-promise/solution.md b/6-async/02-promise-basics/02-delay-promise/solution.md
similarity index 100%
rename from 8-async/02-promise-basics/02-delay-promise/solution.md
rename to 6-async/02-promise-basics/02-delay-promise/solution.md
diff --git a/8-async/02-promise-basics/02-delay-promise/task.md b/6-async/02-promise-basics/02-delay-promise/task.md
similarity index 100%
rename from 8-async/02-promise-basics/02-delay-promise/task.md
rename to 6-async/02-promise-basics/02-delay-promise/task.md
diff --git a/8-async/02-promise-basics/03-animate-circle-promise/solution.md b/6-async/02-promise-basics/03-animate-circle-promise/solution.md
similarity index 100%
rename from 8-async/02-promise-basics/03-animate-circle-promise/solution.md
rename to 6-async/02-promise-basics/03-animate-circle-promise/solution.md
diff --git a/8-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html b/6-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html
similarity index 100%
rename from 8-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html
rename to 6-async/02-promise-basics/03-animate-circle-promise/solution.view/index.html
diff --git a/8-async/02-promise-basics/03-animate-circle-promise/task.md b/6-async/02-promise-basics/03-animate-circle-promise/task.md
similarity index 100%
rename from 8-async/02-promise-basics/03-animate-circle-promise/task.md
rename to 6-async/02-promise-basics/03-animate-circle-promise/task.md
diff --git a/8-async/02-promise-basics/article.md b/6-async/02-promise-basics/article.md
similarity index 100%
rename from 8-async/02-promise-basics/article.md
rename to 6-async/02-promise-basics/article.md
diff --git a/8-async/02-promise-basics/head.html b/6-async/02-promise-basics/head.html
similarity index 100%
rename from 8-async/02-promise-basics/head.html
rename to 6-async/02-promise-basics/head.html
diff --git a/8-async/02-promise-basics/promise-init.png b/6-async/02-promise-basics/promise-init.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-init.png
rename to 6-async/02-promise-basics/promise-init.png
diff --git a/8-async/02-promise-basics/promise-init@2x.png b/6-async/02-promise-basics/promise-init@2x.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-init@2x.png
rename to 6-async/02-promise-basics/promise-init@2x.png
diff --git a/8-async/02-promise-basics/promise-reject-1.png b/6-async/02-promise-basics/promise-reject-1.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-reject-1.png
rename to 6-async/02-promise-basics/promise-reject-1.png
diff --git a/8-async/02-promise-basics/promise-reject-1@2x.png b/6-async/02-promise-basics/promise-reject-1@2x.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-reject-1@2x.png
rename to 6-async/02-promise-basics/promise-reject-1@2x.png
diff --git a/8-async/02-promise-basics/promise-resolve-1.png b/6-async/02-promise-basics/promise-resolve-1.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-resolve-1.png
rename to 6-async/02-promise-basics/promise-resolve-1.png
diff --git a/8-async/02-promise-basics/promise-resolve-1@2x.png b/6-async/02-promise-basics/promise-resolve-1@2x.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-resolve-1@2x.png
rename to 6-async/02-promise-basics/promise-resolve-1@2x.png
diff --git a/8-async/02-promise-basics/promise-resolve-reject.png b/6-async/02-promise-basics/promise-resolve-reject.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-resolve-reject.png
rename to 6-async/02-promise-basics/promise-resolve-reject.png
diff --git a/8-async/02-promise-basics/promise-resolve-reject@2x.png b/6-async/02-promise-basics/promise-resolve-reject@2x.png
similarity index 100%
rename from 8-async/02-promise-basics/promise-resolve-reject@2x.png
rename to 6-async/02-promise-basics/promise-resolve-reject@2x.png
diff --git a/8-async/03-promise-chaining/01-then-vs-catch/solution.md b/6-async/03-promise-chaining/01-then-vs-catch/solution.md
similarity index 100%
rename from 8-async/03-promise-chaining/01-then-vs-catch/solution.md
rename to 6-async/03-promise-chaining/01-then-vs-catch/solution.md
diff --git a/8-async/03-promise-chaining/01-then-vs-catch/task.md b/6-async/03-promise-chaining/01-then-vs-catch/task.md
similarity index 100%
rename from 8-async/03-promise-chaining/01-then-vs-catch/task.md
rename to 6-async/03-promise-chaining/01-then-vs-catch/task.md
diff --git a/8-async/03-promise-chaining/02-error-async/solution.md b/6-async/03-promise-chaining/02-error-async/solution.md
similarity index 100%
rename from 8-async/03-promise-chaining/02-error-async/solution.md
rename to 6-async/03-promise-chaining/02-error-async/solution.md
diff --git a/8-async/03-promise-chaining/02-error-async/task.md b/6-async/03-promise-chaining/02-error-async/task.md
similarity index 100%
rename from 8-async/03-promise-chaining/02-error-async/task.md
rename to 6-async/03-promise-chaining/02-error-async/task.md
diff --git a/8-async/03-promise-chaining/article.md b/6-async/03-promise-chaining/article.md
similarity index 100%
rename from 8-async/03-promise-chaining/article.md
rename to 6-async/03-promise-chaining/article.md
diff --git a/8-async/03-promise-chaining/getMessage.js b/6-async/03-promise-chaining/getMessage.js
similarity index 100%
rename from 8-async/03-promise-chaining/getMessage.js
rename to 6-async/03-promise-chaining/getMessage.js
diff --git a/8-async/03-promise-chaining/head.html b/6-async/03-promise-chaining/head.html
similarity index 100%
rename from 8-async/03-promise-chaining/head.html
rename to 6-async/03-promise-chaining/head.html
diff --git a/8-async/03-promise-chaining/one.js b/6-async/03-promise-chaining/one.js
similarity index 100%
rename from 8-async/03-promise-chaining/one.js
rename to 6-async/03-promise-chaining/one.js
diff --git a/8-async/03-promise-chaining/promise-handler-variants-2.png b/6-async/03-promise-chaining/promise-handler-variants-2.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-handler-variants-2.png
rename to 6-async/03-promise-chaining/promise-handler-variants-2.png
diff --git a/8-async/03-promise-chaining/promise-handler-variants-2@2x.png b/6-async/03-promise-chaining/promise-handler-variants-2@2x.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-handler-variants-2@2x.png
rename to 6-async/03-promise-chaining/promise-handler-variants-2@2x.png
diff --git a/8-async/03-promise-chaining/promise-handler-variants.png b/6-async/03-promise-chaining/promise-handler-variants.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-handler-variants.png
rename to 6-async/03-promise-chaining/promise-handler-variants.png
diff --git a/8-async/03-promise-chaining/promise-handler-variants@2x.png b/6-async/03-promise-chaining/promise-handler-variants@2x.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-handler-variants@2x.png
rename to 6-async/03-promise-chaining/promise-handler-variants@2x.png
diff --git a/8-async/03-promise-chaining/promise-then-chain.png b/6-async/03-promise-chaining/promise-then-chain.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-then-chain.png
rename to 6-async/03-promise-chaining/promise-then-chain.png
diff --git a/8-async/03-promise-chaining/promise-then-chain@2x.png b/6-async/03-promise-chaining/promise-then-chain@2x.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-then-chain@2x.png
rename to 6-async/03-promise-chaining/promise-then-chain@2x.png
diff --git a/8-async/03-promise-chaining/promise-then-many.png b/6-async/03-promise-chaining/promise-then-many.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-then-many.png
rename to 6-async/03-promise-chaining/promise-then-many.png
diff --git a/8-async/03-promise-chaining/promise-then-many@2x.png b/6-async/03-promise-chaining/promise-then-many@2x.png
similarity index 100%
rename from 8-async/03-promise-chaining/promise-then-many@2x.png
rename to 6-async/03-promise-chaining/promise-then-many@2x.png
diff --git a/8-async/03-promise-chaining/three.js b/6-async/03-promise-chaining/three.js
similarity index 100%
rename from 8-async/03-promise-chaining/three.js
rename to 6-async/03-promise-chaining/three.js
diff --git a/8-async/03-promise-chaining/two.js b/6-async/03-promise-chaining/two.js
similarity index 100%
rename from 8-async/03-promise-chaining/two.js
rename to 6-async/03-promise-chaining/two.js
diff --git a/8-async/03-promise-chaining/user.json b/6-async/03-promise-chaining/user.json
similarity index 100%
rename from 8-async/03-promise-chaining/user.json
rename to 6-async/03-promise-chaining/user.json
diff --git a/8-async/04-promise-api/01-promise-errors-as-results/solution.md b/6-async/04-promise-api/01-promise-errors-as-results/solution.md
similarity index 100%
rename from 8-async/04-promise-api/01-promise-errors-as-results/solution.md
rename to 6-async/04-promise-api/01-promise-errors-as-results/solution.md
diff --git a/8-async/04-promise-api/01-promise-errors-as-results/solution.view/index.html b/6-async/04-promise-api/01-promise-errors-as-results/solution.view/index.html
similarity index 100%
rename from 8-async/04-promise-api/01-promise-errors-as-results/solution.view/index.html
rename to 6-async/04-promise-api/01-promise-errors-as-results/solution.view/index.html
diff --git a/8-async/04-promise-api/01-promise-errors-as-results/source.view/index.html b/6-async/04-promise-api/01-promise-errors-as-results/source.view/index.html
similarity index 100%
rename from 8-async/04-promise-api/01-promise-errors-as-results/source.view/index.html
rename to 6-async/04-promise-api/01-promise-errors-as-results/source.view/index.html
diff --git a/8-async/04-promise-api/01-promise-errors-as-results/task.md b/6-async/04-promise-api/01-promise-errors-as-results/task.md
similarity index 100%
rename from 8-async/04-promise-api/01-promise-errors-as-results/task.md
rename to 6-async/04-promise-api/01-promise-errors-as-results/task.md
diff --git a/8-async/04-promise-api/02-promise-errors-as-results-2/solution.md b/6-async/04-promise-api/02-promise-errors-as-results-2/solution.md
similarity index 100%
rename from 8-async/04-promise-api/02-promise-errors-as-results-2/solution.md
rename to 6-async/04-promise-api/02-promise-errors-as-results-2/solution.md
diff --git a/8-async/04-promise-api/02-promise-errors-as-results-2/solution.view/index.html b/6-async/04-promise-api/02-promise-errors-as-results-2/solution.view/index.html
similarity index 100%
rename from 8-async/04-promise-api/02-promise-errors-as-results-2/solution.view/index.html
rename to 6-async/04-promise-api/02-promise-errors-as-results-2/solution.view/index.html
diff --git a/8-async/04-promise-api/02-promise-errors-as-results-2/source.view/index.html b/6-async/04-promise-api/02-promise-errors-as-results-2/source.view/index.html
similarity index 100%
rename from 8-async/04-promise-api/02-promise-errors-as-results-2/source.view/index.html
rename to 6-async/04-promise-api/02-promise-errors-as-results-2/source.view/index.html
diff --git a/8-async/04-promise-api/02-promise-errors-as-results-2/task.md b/6-async/04-promise-api/02-promise-errors-as-results-2/task.md
similarity index 100%
rename from 8-async/04-promise-api/02-promise-errors-as-results-2/task.md
rename to 6-async/04-promise-api/02-promise-errors-as-results-2/task.md
diff --git a/8-async/04-promise-api/article.md b/6-async/04-promise-api/article.md
similarity index 100%
rename from 8-async/04-promise-api/article.md
rename to 6-async/04-promise-api/article.md
diff --git a/8-async/04-promise-api/head.html b/6-async/04-promise-api/head.html
similarity index 100%
rename from 8-async/04-promise-api/head.html
rename to 6-async/04-promise-api/head.html
diff --git a/8-async/04-promise-api/iliakan.json b/6-async/04-promise-api/iliakan.json
similarity index 100%
rename from 8-async/04-promise-api/iliakan.json
rename to 6-async/04-promise-api/iliakan.json
diff --git a/8-async/04-promise-api/one.js b/6-async/04-promise-api/one.js
similarity index 100%
rename from 8-async/04-promise-api/one.js
rename to 6-async/04-promise-api/one.js
diff --git a/8-async/04-promise-api/two.js b/6-async/04-promise-api/two.js
similarity index 100%
rename from 8-async/04-promise-api/two.js
rename to 6-async/04-promise-api/two.js
diff --git a/8-async/05-async-await/01-rewrite-async-2/solution.md b/6-async/05-async-await/01-rewrite-async-2/solution.md
similarity index 100%
rename from 8-async/05-async-await/01-rewrite-async-2/solution.md
rename to 6-async/05-async-await/01-rewrite-async-2/solution.md
diff --git a/8-async/05-async-await/01-rewrite-async-2/task.md b/6-async/05-async-await/01-rewrite-async-2/task.md
similarity index 100%
rename from 8-async/05-async-await/01-rewrite-async-2/task.md
rename to 6-async/05-async-await/01-rewrite-async-2/task.md
diff --git a/8-async/05-async-await/01-rewrite-async/solution.md b/6-async/05-async-await/01-rewrite-async/solution.md
similarity index 100%
rename from 8-async/05-async-await/01-rewrite-async/solution.md
rename to 6-async/05-async-await/01-rewrite-async/solution.md
diff --git a/8-async/05-async-await/01-rewrite-async/task.md b/6-async/05-async-await/01-rewrite-async/task.md
similarity index 100%
rename from 8-async/05-async-await/01-rewrite-async/task.md
rename to 6-async/05-async-await/01-rewrite-async/task.md
diff --git a/8-async/05-async-await/article.md b/6-async/05-async-await/article.md
similarity index 100%
rename from 8-async/05-async-await/article.md
rename to 6-async/05-async-await/article.md
diff --git a/8-async/05-async-await/head.html b/6-async/05-async-await/head.html
similarity index 100%
rename from 8-async/05-async-await/head.html
rename to 6-async/05-async-await/head.html
diff --git a/6-async/index.md b/6-async/index.md
new file mode 100644
index 00000000..a6ec5439
--- /dev/null
+++ b/6-async/index.md
@@ -0,0 +1,2 @@
+
+# Promises, async/await
diff --git a/8-async/index.md b/8-async/index.md
deleted file mode 100644
index 69396ef5..00000000
--- a/8-async/index.md
+++ /dev/null
@@ -1,2 +0,0 @@
-
-# The art of async programming: promises, async/await