diff --git a/index.js b/index.js
deleted file mode 100644
index b96c945..0000000
--- a/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const { EventParser } = require('./lib');
-
-module.exports = EventParser;
diff --git a/lib/event-parser.js b/lib/event-parser.js
index b015763..5a2ec49 100644
--- a/lib/event-parser.js
+++ b/lib/event-parser.js
@@ -4,6 +4,8 @@ const EventParserError = require('./event-parser-error');
 
 const ModelEvent = require('./model-event');
 
+const modelEvent = new ModelEvent();
+
 class EventParser {
 	/**
 	 * Get the event actions
@@ -21,7 +23,6 @@ class EventParser {
 		if(!entity || !event)
 			throw new EventParserError('Message entity and event are required', EventParserError.codes.INVALID_DATA);
 
-		const modelEvent = new ModelEvent();
 		const { subscribers } = await modelEvent.getEvent(client, entity, event);
 
 		return subscribers && Array.isArray(subscribers) ? subscribers : [];
diff --git a/lib/index.js b/lib/index.js
deleted file mode 100644
index 4992ee6..0000000
--- a/lib/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-const EventParser = require('./event-parser');
-const ModelEvent = require('./model-event');
-
-module.exports = {
-	EventParser,
-	ModelEvent
-};
diff --git a/package-lock.json b/package-lock.json
index 149d9e7..be91753 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -829,9 +829,9 @@
       }
     },
     "eslint-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz",
-      "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz",
+      "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.0.0"
diff --git a/package.json b/package.json
index f423551..3c01b00 100644
--- a/package.json
+++ b/package.json
@@ -2,13 +2,13 @@
   "name": "@janiscommerce/event-parser",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "lib/event-parser.js",
   "scripts": {
     "test": "export TEST_ENV=true; mocha --exit -R nyan --recursive tests/",
     "test-ci": "nyc --reporter=html --reporter=text mocha --recursive tests/",
     "watch-test": "export TEST_ENV=true; mocha --exit -R nyan -w --recursive tests/",
     "coverage": "nyc npm test",
-    "lint": "eslint index.js lib/ tests/"
+    "lint": "eslint lib/ tests/"
   },
   "repository": {
     "type": "git",
diff --git a/tests/event-parser-test.js b/tests/event-parser-test.js
index 55db206..ca34405 100644
--- a/tests/event-parser-test.js
+++ b/tests/event-parser-test.js
@@ -4,9 +4,9 @@ const assert = require('assert');
 
 const sandbox = require('sinon').createSandbox();
 
-const Package = require('../index');
+const EventParser = require('../lib/event-parser');
 
-const { EventParser, ModelEvent } = require('../lib');
+const ModelEvent = require('../lib/model-event');
 
 describe('EventParser', () => {
 	const message = {
@@ -26,10 +26,6 @@ describe('EventParser', () => {
 		sandbox.restore();
 	});
 
-	it('Should return and instance of event parser', () => {
-		assert.deepStrictEqual(Package, EventParser);
-	});
-
 	it('Should throw error when not receive message', async () => {
 		await assert.rejects(EventParser.getSubscribers(), {
 			name: 'EventParserError',
diff --git a/tests/model-event-test.js b/tests/model-event-test.js
index a64805f..c753162 100644
--- a/tests/model-event-test.js
+++ b/tests/model-event-test.js
@@ -6,7 +6,7 @@ const Settings = require('@janiscommerce/settings');
 
 const sandbox = require('sinon').createSandbox();
 
-const { ModelEvent } = require('../lib');
+const ModelEvent = require('../lib/model-event');
 
 const modelEvent = new ModelEvent();