diff --git a/1-node-farm/final/index.js b/1-node-farm/final/index.js
index 5138495827..445c553148 100644
--- a/1-node-farm/final/index.js
+++ b/1-node-farm/final/index.js
@@ -1,8 +1,14 @@
-const fs = require('fs');
-const http = require('http');
-const url = require('url');
-const slugify = require('slugify');
-const replaceTemplate = require('./modules/replaceTemplate');
+// const fs = require( 'fs' );
+// const http = require('http');
+// const url = require('url');
+// const slugify = require('slugify');
+// const replaceTemplate = require('./modules/replaceTemplate');
+
+import fs from 'fs';
+import http from 'http';
+import url from 'url';
+import slugify from 'slugify';
+import replaceTemplate from './modules/replaceTemplate';
 
 /////////////////////////////////
 // FILES
@@ -49,7 +55,7 @@ const tempProduct = fs.readFileSync(
 const data = fs.readFileSync(`${__dirname}/dev-data/data.json`, 'utf-8');
 const dataObj = JSON.parse(data);
 
-const slugs = dataObj.map(el => slugify(el.productName, { lower: true }));
+const slugs = dataObj.map((el) => slugify(el.productName, { lower: true }));
 console.log(slugs);
 
 const server = http.createServer((req, res) => {
@@ -58,17 +64,19 @@ const server = http.createServer((req, res) => {
   // Overview page
   if (pathname === '/' || pathname === '/overview') {
     res.writeHead(200, {
-      'Content-type': 'text/html'
+      'Content-type': 'text/html',
     });
 
-    const cardsHtml = dataObj.map(el => replaceTemplate(tempCard, el)).join('');
+    const cardsHtml = dataObj
+      .map((el) => replaceTemplate(tempCard, el))
+      .join('');
     const output = tempOverview.replace('{%PRODUCT_CARDS%}', cardsHtml);
     res.end(output);
 
     // Product page
   } else if (pathname === '/product') {
     res.writeHead(200, {
-      'Content-type': 'text/html'
+      'Content-type': 'text/html',
     });
     const product = dataObj[query.id];
     const output = replaceTemplate(tempProduct, product);
@@ -77,7 +85,7 @@ const server = http.createServer((req, res) => {
     // API
   } else if (pathname === '/api') {
     res.writeHead(200, {
-      'Content-type': 'application/json'
+      'Content-type': 'application/json',
     });
     res.end(data);
 
@@ -85,7 +93,7 @@ const server = http.createServer((req, res) => {
   } else {
     res.writeHead(404, {
       'Content-type': 'text/html',
-      'my-own-header': 'hello-world'
+      'my-own-header': 'hello-world',
     });
     res.end('<h1>Page not found!</h1>');
   }
diff --git a/1-node-farm/final/package.json b/1-node-farm/final/package.json
index 693ec88952..3497808163 100644
--- a/1-node-farm/final/package.json
+++ b/1-node-farm/final/package.json
@@ -1,6 +1,7 @@
 {
   "name": "node-farm",
   "version": "1.0.0",
+  "type": "module",
   "description": "Learning node.js",
   "main": "index.js",
   "scripts": {
diff --git a/3-asynchronous-JS/final/index.js b/3-asynchronous-JS/final/index.js
index 38d689952c..9df24c967d 100644
--- a/3-asynchronous-JS/final/index.js
+++ b/3-asynchronous-JS/final/index.js
@@ -1,7 +1,9 @@
-const fs = require('fs');
-const superagent = require('superagent');
+import fs from 'fs';
+import superagent from 'superagent';
+// const fs = require( 'fs' );
+// const superagent = require('superagent');
 
-const readFilePro = file => {
+const readFilePro = (file) => {
   return new Promise((resolve, reject) => {
     fs.readFile(file, (err, data) => {
       if (err) reject('I could not find that file 😢');
@@ -12,7 +14,7 @@ const readFilePro = file => {
 
 const writeFilePro = (file, data) => {
   return new Promise((resolve, reject) => {
-    fs.writeFile(file, data, err => {
+    fs.writeFile(file, data, (err) => {
       if (err) reject('Could not write file 😢');
       resolve('success');
     });
@@ -34,7 +36,7 @@ const getDogPic = async () => {
       `https://dog.ceo/api/breed/${data}/images/random`
     );
     const all = await Promise.all([res1Pro, res2Pro, res3Pro]);
-    const imgs = all.map(el => el.body.message);
+    const imgs = all.map((el) => el.body.message);
     console.log(imgs);
 
     await writeFilePro('dog-img.txt', imgs.join('\n'));
diff --git a/3-asynchronous-JS/final/package.json b/3-asynchronous-JS/final/package.json
index 864cb95fa2..23cc24da2d 100644
--- a/3-asynchronous-JS/final/package.json
+++ b/3-asynchronous-JS/final/package.json
@@ -1,6 +1,7 @@
 {
   "name": "3-asynchronous-js",
   "version": "1.0.0",
+  "type": "module",
   "description": "",
   "main": "index.js",
   "scripts": {
diff --git a/4-natours/after-section-06/app.js b/4-natours/after-section-06/app.js
index 410fbe52e8..48dc6f158f 100644
--- a/4-natours/after-section-06/app.js
+++ b/4-natours/after-section-06/app.js
@@ -1,8 +1,13 @@
-const express = require('express');
-const morgan = require('morgan');
+import express from "express";
+import morgan from "morgan";
+import tourRouter from "./routes/tourRoutes";
+import userRouter from "./routes/userRoutes";
 
-const tourRouter = require('./routes/tourRoutes');
-const userRouter = require('./routes/userRoutes');
+// const express = require( 'express' );
+// const morgan = require('morgan');
+
+// const tourRouter = require('./routes/tourRoutes');
+// const userRouter = require('./routes/userRoutes');
 
 const app = express();
 
diff --git a/4-natours/after-section-06/controllers/tourController.js b/4-natours/after-section-06/controllers/tourController.js
index c01ab91406..1eed07cd02 100644
--- a/4-natours/after-section-06/controllers/tourController.js
+++ b/4-natours/after-section-06/controllers/tourController.js
@@ -1,4 +1,5 @@
-const fs = require('fs');
+import fs from "fs";
+// const fs = require( 'fs' );
 
 const tours = JSON.parse(
   fs.readFileSync(`${__dirname}/../dev-data/data/tours-simple.json`)
diff --git a/4-natours/after-section-06/package.json b/4-natours/after-section-06/package.json
index 0c5d94ac2b..4daf41a012 100644
--- a/4-natours/after-section-06/package.json
+++ b/4-natours/after-section-06/package.json
@@ -1,6 +1,7 @@
 {
   "name": "natours",
   "version": "1.0.0",
+  "type": "module",
   "description": "Learning node, express and mongoDB",
   "main": "app.js",
   "scripts": {
diff --git a/4-natours/after-section-06/routes/tourRoutes.js b/4-natours/after-section-06/routes/tourRoutes.js
index e6855a4d8e..0b92bcaecd 100644
--- a/4-natours/after-section-06/routes/tourRoutes.js
+++ b/4-natours/after-section-06/routes/tourRoutes.js
@@ -1,5 +1,8 @@
-const express = require('express');
-const tourController = require('./../controllers/tourController');
+import express from "express";
+import tourController from "./../controllers/tourController"
+
+// const express = require('express');
+// const tourController = require('./../controllers/tourController');
 
 const router = express.Router();
 
diff --git a/4-natours/after-section-06/routes/userRoutes.js b/4-natours/after-section-06/routes/userRoutes.js
index ca3071f32b..308bb217ed 100644
--- a/4-natours/after-section-06/routes/userRoutes.js
+++ b/4-natours/after-section-06/routes/userRoutes.js
@@ -1,5 +1,8 @@
-const express = require('express');
-const userController = require('./../controllers/userController');
+import express from "express";
+import userController from "./../controllers/userController"
+
+// const express = require( 'express' );
+// const userController = require('./../controllers/userController');
 
 const router = express.Router();
 
diff --git a/4-natours/after-section-06/server.js b/4-natours/after-section-06/server.js
index 533cd89c17..e97ae75d5b 100644
--- a/4-natours/after-section-06/server.js
+++ b/4-natours/after-section-06/server.js
@@ -1,5 +1,9 @@
-const dotenv = require('dotenv');
-const app = require('./app');
+import dotenv from "dotenv";
+import app from "./app";
+
+// const dotenv = require( 'dotenv' );
+// const app = require('./app');
+
 
 dotenv.config({ path: './config.env' });