diff --git a/scripts/run-mode-debug.js b/scripts/run-mode-debug.js
index f03b11a..291057e 100644
--- a/scripts/run-mode-debug.js
+++ b/scripts/run-mode-debug.js
@@ -15,7 +15,7 @@ dynamo.AWS.config.update({
 
 //
 // microservice with express
-const microservice = require('../src/microservice/notes.microservice');
+const microservice = require('../src/microservice');
 
 microservice.listen(process.env.PORT || 3000, () => {
   /* eslint-disable no-console */
diff --git a/src/handler.js b/src/handler.js
index 9466710..81dfdcf 100644
--- a/src/handler.js
+++ b/src/handler.js
@@ -7,7 +7,7 @@ const awsServerlessExpressMiddleware = require('aws-serverless-express/middlewar
 
 //
 // microservice
-const microservice = require('./microservice/notes.microservice');
+const microservice = require('./microservice');
 microservice.use(awsServerlessExpressMiddleware.eventContext());
 
 //
diff --git a/src/microservice/helpers/modules/error.helper.js b/src/helpers/error.helper.js
similarity index 92%
rename from src/microservice/helpers/modules/error.helper.js
rename to src/helpers/error.helper.js
index 08b50c7..fa73379 100644
--- a/src/microservice/helpers/modules/error.helper.js
+++ b/src/helpers/error.helper.js
@@ -1,4 +1,4 @@
-'user strict';
+'use strict';
 
 class ErrorHelper extends Error {
   constructor(name, message, code) {
diff --git a/src/helpers/index.js b/src/helpers/index.js
new file mode 100644
index 0000000..dfbf9cc
--- /dev/null
+++ b/src/helpers/index.js
@@ -0,0 +1,11 @@
+'use strict';
+
+const ErrorHelper = require('./error.helper');
+const requestHelper = require('./request.helper');
+const responseHelper = require('./response.helper');
+
+module.exports = {
+  ErrorHelper,
+  requestHelper,
+  responseHelper
+};
\ No newline at end of file
diff --git a/src/microservice/helpers/modules/request.helper.js b/src/helpers/request.helper.js
similarity index 91%
rename from src/microservice/helpers/modules/request.helper.js
rename to src/helpers/request.helper.js
index 91df9c6..97d8790 100644
--- a/src/microservice/helpers/modules/request.helper.js
+++ b/src/helpers/request.helper.js
@@ -1,4 +1,4 @@
-'user strict';
+'use strict';
 
 const requestHelper = {
   getRequestId(req) {
diff --git a/src/microservice/helpers/modules/response.helper.js b/src/helpers/response.helper.js
similarity index 98%
rename from src/microservice/helpers/modules/response.helper.js
rename to src/helpers/response.helper.js
index c0f2dec..5875a2c 100644
--- a/src/microservice/helpers/modules/response.helper.js
+++ b/src/helpers/response.helper.js
@@ -1,4 +1,4 @@
-'user strict';
+'use strict';
 
 //
 // internal module
diff --git a/src/microservice/helpers/index.js b/src/microservice/helpers/index.js
deleted file mode 100644
index bc01fcb..0000000
--- a/src/microservice/helpers/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-
-const ErrorHelper = require('./modules/error.helper');
-const requestHelper = require('./modules/request.helper');
-const responseHelper = require('./modules/response.helper');
-
-module.exports = {
-  ErrorHelper,
-  requestHelper,
-  responseHelper
-};
\ No newline at end of file
diff --git a/src/microservice/index.js b/src/microservice/index.js
new file mode 100644
index 0000000..eac9ac2
--- /dev/null
+++ b/src/microservice/index.js
@@ -0,0 +1,21 @@
+'use strict';
+
+//
+// exnternal modules
+const express = require('express');
+const bodyParser = require('body-parser');
+
+//
+// configure microservice with express
+const microservice = express();
+microservice.use(bodyParser.json());
+
+//
+// internal modules
+const notesRouter = require('./notes.router');
+
+//
+// routes
+microservice.use(notesRouter);
+
+module.exports = microservice;
\ No newline at end of file
diff --git a/src/microservice/controllers/notes.controller.js b/src/microservice/notes.controller.js
similarity index 96%
rename from src/microservice/controllers/notes.controller.js
rename to src/microservice/notes.controller.js
index a013802..93bdcc0 100644
--- a/src/microservice/controllers/notes.controller.js
+++ b/src/microservice/notes.controller.js
@@ -2,7 +2,7 @@
 
 //
 // internal modules
-const notesRepositoy = require('./repositories/notes.repository');
+const notesRepositoy = require('./notes.repository');
 const { responseHelper } = require('../helpers');
 
 const notesController = {
diff --git a/src/microservice/notes.microservice.js b/src/microservice/notes.microservice.js
deleted file mode 100644
index 6e29b2b..0000000
--- a/src/microservice/notes.microservice.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-
-//
-// exnternal modules
-const express = require('express');
-const bodyParser = require('body-parser');
-
-//
-// configure microservice with express
-const microservice = express();
-microservice.use(bodyParser.json());
-
-//
-// internal modules
-const notesController = require('./controllers/notes.controller');
-
-//
-// routes
-microservice.get('/notes/:id', notesController.getById);
-microservice.put('/notes/:id', notesController.update);
-microservice.delete('/notes/:id', notesController.delete);
-
-microservice.get('/notes', notesController.getAll);
-microservice.post('/notes', notesController.create);
-
-module.exports = microservice;
\ No newline at end of file
diff --git a/src/microservice/models/notes.model.js b/src/microservice/notes.model.js
similarity index 100%
rename from src/microservice/models/notes.model.js
rename to src/microservice/notes.model.js
diff --git a/src/microservice/controllers/repositories/notes.repository.js b/src/microservice/notes.repository.js
similarity index 96%
rename from src/microservice/controllers/repositories/notes.repository.js
rename to src/microservice/notes.repository.js
index 862af52..7e2a259 100644
--- a/src/microservice/controllers/repositories/notes.repository.js
+++ b/src/microservice/notes.repository.js
@@ -6,8 +6,8 @@ const Promise = require('bluebird');
 const uuidv4 = require('uuid/v4');
 
 // internal modules
-const NotesModule = require('../../models/notes.model');
-const { ErrorHelper } = require('../../helpers');
+const NotesModule = require('./notes.model');
+const { ErrorHelper } = require('../helpers');
 
 const _getById = (id, userId, name = 'notesRepository.getById') => {
   return new Promise((resolve, reject) => {
diff --git a/src/microservice/notes.router.js b/src/microservice/notes.router.js
new file mode 100644
index 0000000..3f22a34
--- /dev/null
+++ b/src/microservice/notes.router.js
@@ -0,0 +1,23 @@
+'use strict';
+
+//
+// exnternal modules
+const express = require('express');
+
+//
+// internal modules
+const notesController = require('./notes.controller');
+
+//
+// routes
+const notesRouter = express.Router();
+notesRouter.route('/notes')
+  .get(notesController.getAll)
+  .post(notesController.create);
+
+notesRouter.route('/notes/:id')
+  .get(notesController.getById)
+  .put(notesController.update)
+  .delete(notesController.delete);
+
+module.exports = notesRouter;
\ No newline at end of file
diff --git a/tests/001-post-put-delete-notes.test.js b/tests/001-post-put-delete-notes.test.js
index e8c29df..2fb7748 100644
--- a/tests/001-post-put-delete-notes.test.js
+++ b/tests/001-post-put-delete-notes.test.js
@@ -8,7 +8,7 @@ const { expect } = require('chai');
 //
 // internal modules
 const helperTest = require('./helper.test');
-const api = require('../src/microservice/notes.microservice');
+const api = require('../src/microservice');
 
 describe('Create, Update and Delete notes', () => {
   const request = supertest(api);
diff --git a/tests/002-get-all.test.js b/tests/002-get-all.test.js
index d44d0a4..c900c4b 100644
--- a/tests/002-get-all.test.js
+++ b/tests/002-get-all.test.js
@@ -8,7 +8,7 @@ const { expect } = require('chai');
 //
 // internal modules
 const helperTest = require('./helper.test');
-const api = require('../src/microservice/notes.microservice');
+const api = require('../src/microservice');
 
 describe('Get all notes', () => {
   const request = supertest(api);
diff --git a/tests/003-get-by-id.test.js b/tests/003-get-by-id.test.js
index 64097bb..cb06d1d 100644
--- a/tests/003-get-by-id.test.js
+++ b/tests/003-get-by-id.test.js
@@ -8,7 +8,7 @@ const { expect } = require('chai');
 //
 // internal modules
 const helperTest = require('./helper.test');
-const api = require('../src/microservice/notes.microservice');
+const api = require('../src/microservice');
 
 describe('Get note', () => {
   const request = supertest(api);