diff --git a/.eslintrc b/.eslintrc
index d152dbba..5fb91e5c 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -31,7 +31,8 @@
     "no-undef": 0,
     "no-underscore-dangle": "off",
     "no-use-before-define": 0,
-    "import/no-cycle": 0
+    "import/no-cycle": 0,
+    "import/no-useless-path-segments": 0
   },
   "globals": {
     "__DEV__": true,
diff --git a/src/modules/admob/Interstitial.js b/src/modules/admob/Interstitial.js
index a2586be7..a2f4c821 100644
--- a/src/modules/admob/Interstitial.js
+++ b/src/modules/admob/Interstitial.js
@@ -1,10 +1,10 @@
 import { Platform } from 'react-native';
-import { statics } from '.';
+import { statics } from './';
 import AdRequest from './AdRequest';
 import { SharedEventEmitter } from '../../utils/events';
 import { getNativeModule } from '../../utils/native';
 import { nativeToJSError } from '../../utils';
-import type AdMob from '.';
+import type AdMob from './';
 
 let subscriptions = [];
 
diff --git a/src/modules/admob/RewardedVideo.js b/src/modules/admob/RewardedVideo.js
index 20c44af7..f5f6e0db 100644
--- a/src/modules/admob/RewardedVideo.js
+++ b/src/modules/admob/RewardedVideo.js
@@ -1,9 +1,9 @@
-import { statics } from '.';
+import { statics } from './';
 import AdRequest from './AdRequest';
 import { SharedEventEmitter } from '../../utils/events';
 import { getNativeModule } from '../../utils/native';
 import { nativeToJSError } from '../../utils';
-import type AdMob from '.';
+import type AdMob from './';
 
 let subscriptions = [];
 
diff --git a/src/modules/auth/AuthSettings.js b/src/modules/auth/AuthSettings.js
index dc7b198d..997efc79 100644
--- a/src/modules/auth/AuthSettings.js
+++ b/src/modules/auth/AuthSettings.js
@@ -1,7 +1,7 @@
 import { getNativeModule } from '../../utils/native';
 import { isAndroid, isIOS } from '../../utils';
 
-import type Auth from '.';
+import type Auth from './';
 
 /**
  * Interface representing an Auth instance's settings, currently used
diff --git a/src/modules/auth/User.js b/src/modules/auth/User.js
index 637d06fd..96026b66 100644
--- a/src/modules/auth/User.js
+++ b/src/modules/auth/User.js
@@ -5,7 +5,7 @@
 import INTERNALS from '../../utils/internals';
 import { getNativeModule } from '../../utils/native';
 
-import type Auth from '.';
+import type Auth from './';
 import type {
   ActionCodeSettings,
   AuthCredential,
diff --git a/src/modules/database/OnDisconnect.js b/src/modules/database/OnDisconnect.js
index 9d85adc4..f04286b1 100644
--- a/src/modules/database/OnDisconnect.js
+++ b/src/modules/database/OnDisconnect.js
@@ -4,7 +4,7 @@
  */
 import { typeOf } from '../../utils';
 import { getNativeModule } from '../../utils/native';
-import type Database from '.';
+import type Database from './';
 import type Reference from './Reference';
 
 /**
diff --git a/src/modules/database/Reference.js b/src/modules/database/Reference.js
index 374f00ff..7bb92e2b 100644
--- a/src/modules/database/Reference.js
+++ b/src/modules/database/Reference.js
@@ -21,7 +21,7 @@ import {
 
 import SyncTree from '../../utils/SyncTree';
 
-import type Database from '.';
+import type Database from './';
 import type { DatabaseModifier, FirebaseError } from '../../types';
 
 // track all event registrations by path
diff --git a/src/modules/database/transaction.js b/src/modules/database/transaction.js
index bedccdd0..bdfe2a2c 100644
--- a/src/modules/database/transaction.js
+++ b/src/modules/database/transaction.js
@@ -5,7 +5,7 @@
 import { getAppEventName, SharedEventEmitter } from '../../utils/events';
 import { getLogger } from '../../utils/log';
 import { getNativeModule } from '../../utils/native';
-import type Database from '.';
+import type Database from './';
 
 let transactionId = 0;
 
diff --git a/src/modules/firestore/CollectionReference.js b/src/modules/firestore/CollectionReference.js
index f27aba3b..e8d538ba 100644
--- a/src/modules/firestore/CollectionReference.js
+++ b/src/modules/firestore/CollectionReference.js
@@ -6,7 +6,7 @@ import Query from './Query';
 import DocumentReference from './DocumentReference';
 import { firestoreAutoId } from '../../utils';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type {
   GetOptions,
   MetadataChanges,
diff --git a/src/modules/firestore/DocumentChange.js b/src/modules/firestore/DocumentChange.js
index 62cccbeb..32d61a27 100644
--- a/src/modules/firestore/DocumentChange.js
+++ b/src/modules/firestore/DocumentChange.js
@@ -4,7 +4,7 @@
  */
 import DocumentSnapshot from './DocumentSnapshot';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type { NativeDocumentChange } from './firestoreTypes.flow';
 
 /**
diff --git a/src/modules/firestore/DocumentReference.js b/src/modules/firestore/DocumentReference.js
index 373c30b4..7177a776 100644
--- a/src/modules/firestore/DocumentReference.js
+++ b/src/modules/firestore/DocumentReference.js
@@ -11,7 +11,7 @@ import { getNativeModule } from '../../utils/native';
 import { firestoreAutoId, isFunction, isObject } from '../../utils';
 import { getAppEventName, SharedEventEmitter } from '../../utils/events';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type {
   GetOptions,
   MetadataChanges,
diff --git a/src/modules/firestore/DocumentSnapshot.js b/src/modules/firestore/DocumentSnapshot.js
index 7c611e69..467f1f28 100644
--- a/src/modules/firestore/DocumentSnapshot.js
+++ b/src/modules/firestore/DocumentSnapshot.js
@@ -8,7 +8,7 @@ import Path from './Path';
 import { isObject, deepGet } from '../../utils';
 import { parseNativeMap } from './utils/serialize';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type {
   NativeDocumentSnapshot,
   SnapshotMetadata,
@@ -67,6 +67,6 @@ export default class DocumentSnapshot {
       return extractFieldPathData(this._data, fieldPath._segments);
     }
 
-    return deepGet(this._data, fieldPath, '.');
+    return deepGet(this._data, fieldPath, './');
   };
 }
diff --git a/src/modules/firestore/Query.js b/src/modules/firestore/Query.js
index 79585252..0fce27d8 100644
--- a/src/modules/firestore/Query.js
+++ b/src/modules/firestore/Query.js
@@ -11,7 +11,7 @@ import { buildNativeArray, buildTypeMap } from './utils/serialize';
 import { firestoreAutoId, isFunction, isObject } from '../../utils';
 import { getAppEventName, SharedEventEmitter } from '../../utils/events';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type Path from './Path';
 import type {
   MetadataChanges,
diff --git a/src/modules/firestore/QuerySnapshot.js b/src/modules/firestore/QuerySnapshot.js
index 6562e59a..ffeebe13 100644
--- a/src/modules/firestore/QuerySnapshot.js
+++ b/src/modules/firestore/QuerySnapshot.js
@@ -5,7 +5,7 @@
 import DocumentChange from './DocumentChange';
 import DocumentSnapshot from './DocumentSnapshot';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type {
   NativeDocumentChange,
   NativeDocumentSnapshot,
diff --git a/src/modules/firestore/Transaction.js b/src/modules/firestore/Transaction.js
index e6157931..0f96640a 100644
--- a/src/modules/firestore/Transaction.js
+++ b/src/modules/firestore/Transaction.js
@@ -5,7 +5,7 @@
 import { parseUpdateArgs } from './utils';
 import { buildNativeMap } from './utils/serialize';
 
-import type Firestore from '.';
+import type Firestore from './';
 import type { TransactionMeta } from './TransactionHandler';
 import type DocumentReference from './DocumentReference';
 import DocumentSnapshot from './DocumentSnapshot';
diff --git a/src/modules/firestore/TransactionHandler.js b/src/modules/firestore/TransactionHandler.js
index fe4f48a1..624acf0a 100644
--- a/src/modules/firestore/TransactionHandler.js
+++ b/src/modules/firestore/TransactionHandler.js
@@ -5,7 +5,7 @@
 import { getAppEventName, SharedEventEmitter } from '../../utils/events';
 import { getNativeModule } from '../../utils/native';
 import Transaction from './Transaction';
-import type Firestore from '.';
+import type Firestore from './';
 
 let transactionId = 0;
 
diff --git a/src/modules/firestore/WriteBatch.js b/src/modules/firestore/WriteBatch.js
index ec2fa069..01f827eb 100644
--- a/src/modules/firestore/WriteBatch.js
+++ b/src/modules/firestore/WriteBatch.js
@@ -7,7 +7,7 @@ import { buildNativeMap } from './utils/serialize';
 import { getNativeModule } from '../../utils/native';
 
 import type DocumentReference from './DocumentReference';
-import type Firestore from '.';
+import type Firestore from './';
 import type { SetOptions } from './firestoreTypes.flow';
 
 type DocumentWrite = {
diff --git a/src/modules/notifications/AndroidNotifications.js b/src/modules/notifications/AndroidNotifications.js
index 4d416401..c697d6fd 100644
--- a/src/modules/notifications/AndroidNotifications.js
+++ b/src/modules/notifications/AndroidNotifications.js
@@ -7,7 +7,7 @@ import AndroidChannel from './AndroidChannel';
 import AndroidChannelGroup from './AndroidChannelGroup';
 import { getNativeModule } from '../../utils/native';
 
-import type Notifications from '.';
+import type Notifications from './';
 
 export default class AndroidNotifications {
   _notifications: Notifications;
diff --git a/src/modules/notifications/IOSNotification.js b/src/modules/notifications/IOSNotification.js
index e8e9616a..5623dfda 100644
--- a/src/modules/notifications/IOSNotification.js
+++ b/src/modules/notifications/IOSNotification.js
@@ -3,7 +3,7 @@
  * IOSNotification representation wrapper
  */
 import type Notification from './Notification';
-import type Notifications from '.';
+import type Notifications from './';
 import { type BackgroundFetchResultValue } from './IOSNotifications';
 import type {
   IOSAttachment,
diff --git a/src/modules/notifications/IOSNotifications.js b/src/modules/notifications/IOSNotifications.js
index 59c86605..300a5908 100644
--- a/src/modules/notifications/IOSNotifications.js
+++ b/src/modules/notifications/IOSNotifications.js
@@ -1,6 +1,6 @@
 import { getNativeModule } from '../../utils/native';
 
-import type Notifications from '.';
+import type Notifications from './';
 
 export type BackgroundFetchResultValue = string;
 type BackgroundFetchResult = {
diff --git a/src/modules/notifications/Notification.js b/src/modules/notifications/Notification.js
index 5d7bae0e..d40a6d1b 100644
--- a/src/modules/notifications/Notification.js
+++ b/src/modules/notifications/Notification.js
@@ -8,7 +8,7 @@ import IOSNotification from './IOSNotification';
 import { generatePushID, isObject } from '../../utils';
 
 import type { NativeNotification } from './types';
-import type Notifications from '.';
+import type Notifications from './';
 
 export type NotificationOpen = {|
   action: string,
diff --git a/src/modules/perf/HttpMetric.js b/src/modules/perf/HttpMetric.js
index 8ba11d9e..7016f3a9 100644
--- a/src/modules/perf/HttpMetric.js
+++ b/src/modules/perf/HttpMetric.js
@@ -3,7 +3,7 @@
  * Trace representation wrapper
  */
 import { getNativeModule } from '../../utils/native';
-import type PerformanceMonitoring from '.';
+import type PerformanceMonitoring from './';
 
 export default class HttpMetric {
   url: string;
diff --git a/src/modules/perf/Trace.js b/src/modules/perf/Trace.js
index e323f0dd..3a84f39f 100644
--- a/src/modules/perf/Trace.js
+++ b/src/modules/perf/Trace.js
@@ -3,7 +3,7 @@
  * Trace representation wrapper
  */
 import { getNativeModule } from '../../utils/native';
-import type PerformanceMonitoring from '.';
+import type PerformanceMonitoring from './';
 
 export default class Trace {
   identifier: string;
diff --git a/src/modules/storage/reference.js b/src/modules/storage/reference.js
index 2682555d..5c8e9c58 100644
--- a/src/modules/storage/reference.js
+++ b/src/modules/storage/reference.js
@@ -5,7 +5,7 @@
 import ReferenceBase from '../../utils/ReferenceBase';
 import StorageTask, { UPLOAD_TASK, DOWNLOAD_TASK } from './task';
 import { getNativeModule } from '../../utils/native';
-import type Storage from '.';
+import type Storage from './';
 
 /**
  * @url https://firebase.google.com/docs/reference/js/firebase.storage.Reference
diff --git a/src/modules/storage/task.js b/src/modules/storage/task.js
index e31d0957..7055526a 100644
--- a/src/modules/storage/task.js
+++ b/src/modules/storage/task.js
@@ -2,9 +2,9 @@
  * @flow
  * UploadTask representation wrapper
  */
-import { statics as StorageStatics } from '.';
+import { statics as StorageStatics } from './';
 import { isFunction } from '../../utils';
-import type Storage from '.';
+import type Storage from './';
 import type StorageReference from './reference';
 
 export const UPLOAD_TASK = 'upload';
diff --git a/src/utils/SyncTree.js b/src/utils/SyncTree.js
index 24c0b09f..58d0300a 100644
--- a/src/utils/SyncTree.js
+++ b/src/utils/SyncTree.js
@@ -6,7 +6,7 @@ import { NativeEventEmitter, NativeModules } from 'react-native';
 import { SharedEventEmitter } from './events';
 import DataSnapshot from '../modules/database/DataSnapshot';
 import DatabaseReference from '../modules/database/Reference';
-import { isString, nativeToJSError } from '.';
+import { isString, nativeToJSError } from './';
 
 type Listener = DataSnapshot => any;
 
diff --git a/src/utils/apps.js b/src/utils/apps.js
index a3e83aba..e0560f7f 100644
--- a/src/utils/apps.js
+++ b/src/utils/apps.js
@@ -4,7 +4,7 @@
 import { NativeModules } from 'react-native';
 import App from '../modules/core/app';
 import INTERNALS from './internals';
-import { isAndroid, isObject, isString } from '.';
+import { isAndroid, isObject, isString } from './';
 
 import type {
   FirebaseModule,