diff --git a/src/index.ts b/src/index.ts
index 95dc0ea..9147dc0 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1 +1,3 @@
 export * from './mqtt.module';
+export * from './mqtt.service';
+export * from './mqtt.model';
diff --git a/src/mqtt.module.ts b/src/mqtt.module.ts
index 9ab6ef5..96a55d5 100644
--- a/src/mqtt.module.ts
+++ b/src/mqtt.module.ts
@@ -5,9 +5,6 @@ import {
 } from '@angular/core';
 import { IMqttClient, IMqttServiceOptions } from './mqtt.model';
 
-export * from './mqtt.service';
-export * from './mqtt.model';
-
 export const MQTT_SERVICE_OPTIONS: IMqttServiceOptions = {
   connectOnCreate: true,
   hostname: 'localhost',
diff --git a/src/mqtt.service.ts b/src/mqtt.service.ts
index 817357c..b2baa1b 100644
--- a/src/mqtt.service.ts
+++ b/src/mqtt.service.ts
@@ -35,7 +35,7 @@ import {
   MqttConnectionState
 } from './mqtt.model';
 
-import { MqttServiceConfig, MqttClientService } from './index';
+import { MqttServiceConfig, MqttClientService } from './mqtt.module';
 
 /**
  * With an instance of MqttService, you can observe and subscribe to MQTT in multiple places, e.g. in different components,