diff --git a/samples/server/petstore/nodejs-fastify-server/PetApi.js b/samples/server/petstore/nodejs-fastify-server/PetApi.js
deleted file mode 100644
index 7ebb5793e13..00000000000
--- a/samples/server/petstore/nodejs-fastify-server/PetApi.js
+++ /dev/null
@@ -1,97 +0,0 @@
-'use strict';
-
-var utils = require('../utils/writer.js');
-var PetApi = require('../service/PetApiService');
-
-module.exports.addPet = function addPet (req, res, next) {
-  var body = req.swagger.params['body'].value;
-  PetApi.addPet(body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.deletePet = function deletePet (req, res, next) {
-  var petId = req.swagger.params['petId'].value;
-  var apiKey = req.swagger.params['api_key'].value;
-  PetApi.deletePet(petId,apiKey)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.findPetsByStatus = function findPetsByStatus (req, res, next) {
-  var status = req.swagger.params['status'].value;
-  PetApi.findPetsByStatus(status)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.findPetsByTags = function findPetsByTags (req, res, next) {
-  var tags = req.swagger.params['tags'].value;
-  PetApi.findPetsByTags(tags)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.getPetById = function getPetById (req, res, next) {
-  var petId = req.swagger.params['petId'].value;
-  PetApi.getPetById(petId)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.updatePet = function updatePet (req, res, next) {
-  var body = req.swagger.params['body'].value;
-  PetApi.updatePet(body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.updatePetWithForm = function updatePetWithForm (req, res, next) {
-  var petId = req.swagger.params['petId'].value;
-  var name = req.swagger.params['name'].value;
-  var status = req.swagger.params['status'].value;
-  PetApi.updatePetWithForm(petId,name,status)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.uploadFile = function uploadFile (req, res, next) {
-  var petId = req.swagger.params['petId'].value;
-  var additionalMetadata = req.swagger.params['additionalMetadata'].value;
-  var file = req.swagger.params['file'].value;
-  PetApi.uploadFile(petId,additionalMetadata,file)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
diff --git a/samples/server/petstore/nodejs-fastify-server/StoreApi.js b/samples/server/petstore/nodejs-fastify-server/StoreApi.js
deleted file mode 100644
index 37677c8c49d..00000000000
--- a/samples/server/petstore/nodejs-fastify-server/StoreApi.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-
-var utils = require('../utils/writer.js');
-var StoreApi = require('../service/StoreApiService');
-
-module.exports.deleteOrder = function deleteOrder (req, res, next) {
-  var orderId = req.swagger.params['orderId'].value;
-  StoreApi.deleteOrder(orderId)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.getInventory = function getInventory (req, res, next) {
-  StoreApi.getInventory()
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.getOrderById = function getOrderById (req, res, next) {
-  var orderId = req.swagger.params['orderId'].value;
-  StoreApi.getOrderById(orderId)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.placeOrder = function placeOrder (req, res, next) {
-  var body = req.swagger.params['body'].value;
-  StoreApi.placeOrder(body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
diff --git a/samples/server/petstore/nodejs-fastify-server/UserApi.js b/samples/server/petstore/nodejs-fastify-server/UserApi.js
deleted file mode 100644
index 716a18ca9cd..00000000000
--- a/samples/server/petstore/nodejs-fastify-server/UserApi.js
+++ /dev/null
@@ -1,93 +0,0 @@
-'use strict';
-
-var utils = require('../utils/writer.js');
-var UserApi = require('../service/UserApiService');
-
-module.exports.createUser = function createUser (req, res, next) {
-  var body = req.swagger.params['body'].value;
-  UserApi.createUser(body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.createUsersWithArrayInput = function createUsersWithArrayInput (req, res, next) {
-  var body = req.swagger.params['body'].value;
-  UserApi.createUsersWithArrayInput(body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.createUsersWithListInput = function createUsersWithListInput (req, res, next) {
-  var body = req.swagger.params['body'].value;
-  UserApi.createUsersWithListInput(body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.deleteUser = function deleteUser (req, res, next) {
-  var username = req.swagger.params['username'].value;
-  UserApi.deleteUser(username)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.getUserByName = function getUserByName (req, res, next) {
-  var username = req.swagger.params['username'].value;
-  UserApi.getUserByName(username)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.loginUser = function loginUser (req, res, next) {
-  var username = req.swagger.params['username'].value;
-  var password = req.swagger.params['password'].value;
-  UserApi.loginUser(username,password)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.logoutUser = function logoutUser (req, res, next) {
-  UserApi.logoutUser()
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
-
-module.exports.updateUser = function updateUser (req, res, next) {
-  var username = req.swagger.params['username'].value;
-  var body = req.swagger.params['body'].value;
-  UserApi.updateUser(username,body)
-    .then(function (response) {
-      utils.writeJson(res, response);
-    })
-    .catch(function (response) {
-      utils.writeJson(res, response);
-    });
-};
diff --git a/samples/server/petstore/nodejs-fastify-server/index.js b/samples/server/petstore/nodejs-fastify-server/index.js
index 39677b641f6..a94cbb53d53 100644
--- a/samples/server/petstore/nodejs-fastify-server/index.js
+++ b/samples/server/petstore/nodejs-fastify-server/index.js
@@ -1,4 +1,4 @@
-const openapiGlue = require("index.js");
+const openapiGlue = require("../../index.js");
 
 const options = {
   specification: `${__dirname}/openapi.json`,