diff --git a/03_Exercises/03_JavaScript/.vscode/settings.json b/03_Exercises/03_JavaScript/.vscode/settings.json
new file mode 100644
index 00000000..6b665aaa
--- /dev/null
+++ b/03_Exercises/03_JavaScript/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "liveServer.settings.port": 5501
+}
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_1.html b/03_Exercises/03_JavaScript/javascript-basics-01/Step_1.html
deleted file mode 100644
index de81630e..00000000
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_1.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Step 1
-
-
-
-
-
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_2.html b/03_Exercises/03_JavaScript/javascript-basics-01/Step_2.html
deleted file mode 100644
index a2147206..00000000
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Step 2
-
-
-
-
-
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_3.html b/03_Exercises/03_JavaScript/javascript-basics-01/Step_3.html
deleted file mode 100644
index 20b2a198..00000000
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_3.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
- Step 3
-
-
-
-
-
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_4.html b/03_Exercises/03_JavaScript/javascript-basics-01/Step_4.html
deleted file mode 100644
index 12c89425..00000000
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_4.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- Step 4
-
-
-
-
-
-
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_5.html b/03_Exercises/03_JavaScript/javascript-basics-01/Step_5.html
deleted file mode 100644
index 60479f28..00000000
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_5.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- Step 5
-
-
-
-
-
-
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_6.html b/03_Exercises/03_JavaScript/javascript-basics-01/Step_6.html
deleted file mode 100644
index b019dccd..00000000
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_6.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- Step 6
-
-
-
-
-
-
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step1/Step_1.html b/03_Exercises/03_JavaScript/javascript-basics-01/step1/Step_1.html
new file mode 100644
index 00000000..ba30ff0e
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step1/Step_1.html
@@ -0,0 +1,13 @@
+
+
+
+ Step 1
+
+
+
+
+
+
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step1/step1.js b/03_Exercises/03_JavaScript/javascript-basics-01/step1/step1.js
new file mode 100644
index 00000000..d69b1028
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step1/step1.js
@@ -0,0 +1,2 @@
+var x = "name";
+alert(x);
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step2/Step_2.html b/03_Exercises/03_JavaScript/javascript-basics-01/step2/Step_2.html
new file mode 100644
index 00000000..1ec64517
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step2/Step_2.html
@@ -0,0 +1,10 @@
+
+
+
+ Step 2
+
+
+
+
+
+
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step2/step2.js b/03_Exercises/03_JavaScript/javascript-basics-01/step2/step2.js
new file mode 100644
index 00000000..a9044245
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step2/step2.js
@@ -0,0 +1,4 @@
+var x = "name";
+var y = "surname";
+var w = "city";
+alert(x + ":Doe \n" + y + ":John \n" + w + ":New york");
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step3/Step_3.html b/03_Exercises/03_JavaScript/javascript-basics-01/step3/Step_3.html
new file mode 100644
index 00000000..c968b10f
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step3/Step_3.html
@@ -0,0 +1,10 @@
+
+
+
+ Step 3
+
+
+
+
+
+
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step3/step_3.js b/03_Exercises/03_JavaScript/javascript-basics-01/step3/step_3.js
new file mode 100644
index 00000000..7348c697
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step3/step_3.js
@@ -0,0 +1,3 @@
+var firstName= prompt("what is your name?");
+
+alert ("Hello! " + firstName);
\ No newline at end of file
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step4/Step_4.html b/03_Exercises/03_JavaScript/javascript-basics-01/step4/Step_4.html
new file mode 100644
index 00000000..dc7f50e4
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step4/Step_4.html
@@ -0,0 +1,19 @@
+
+
+
+ Step 4
+
+
+
+
+
+
+
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step4/step_4.js b/03_Exercises/03_JavaScript/javascript-basics-01/step4/step_4.js
new file mode 100644
index 00000000..ba2ea711
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step4/step_4.js
@@ -0,0 +1,8 @@
+function human() {
+ var name = document.getElementById("name").value;
+ var surname = document.getElementById("surname").value;
+ var city = document.getElementById("city").value ;
+
+
+ alert(name +'\n' + surname +'\n' + city );
+}
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step5/Step_5.html b/03_Exercises/03_JavaScript/javascript-basics-01/step5/Step_5.html
new file mode 100644
index 00000000..19fa3594
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step5/Step_5.html
@@ -0,0 +1,24 @@
+
+
+
+ Step 5
+
+
+
+
+
+
+
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step5/Step_5.js b/03_Exercises/03_JavaScript/javascript-basics-01/step5/Step_5.js
new file mode 100644
index 00000000..df34ea9e
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step5/Step_5.js
@@ -0,0 +1,6 @@
+function multiplyBy() {
+ var num1 = Number(document.getElementById("first_number").value);
+ var num2 = Number(document.getElementById("second_number").value);
+ var x = (document.getElementById("validate").innerHTML = num1 * num2);
+ alert(x);
+}
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step6/Step_6.html b/03_Exercises/03_JavaScript/javascript-basics-01/step6/Step_6.html
new file mode 100644
index 00000000..cd07ba19
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step6/Step_6.html
@@ -0,0 +1,17 @@
+
+
+
+ Step 6
+
+
+
+
+
+
+
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/step6/step_6.js b/03_Exercises/03_JavaScript/javascript-basics-01/step6/step_6.js
new file mode 100644
index 00000000..5adb9440
--- /dev/null
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step6/step_6.js
@@ -0,0 +1,5 @@
+function divide() {
+ var num1 = document.getElementById("first_number").value;
+ var num2 = document.getElementById("second_number").value;
+ alert(num1 % num2);
+}
diff --git a/03_Exercises/03_JavaScript/javascript-basics-01/Step_7.html b/03_Exercises/03_JavaScript/javascript-basics-01/step7/Step_7.html
similarity index 74%
rename from 03_Exercises/03_JavaScript/javascript-basics-01/Step_7.html
rename to 03_Exercises/03_JavaScript/javascript-basics-01/step7/Step_7.html
index 05ff5834..db331818 100644
--- a/03_Exercises/03_JavaScript/javascript-basics-01/Step_7.html
+++ b/03_Exercises/03_JavaScript/javascript-basics-01/step7/Step_7.html
@@ -8,7 +8,8 @@
+