diff --git a/lib/flutter_map.dart b/lib/flutter_map.dart
index 65aad27ec..99f6eeab0 100644
--- a/lib/flutter_map.dart
+++ b/lib/flutter_map.dart
@@ -26,6 +26,7 @@ export 'package:flutter_map/src/layer/tile_layer/tile_provider/file_providers/ti
 export 'package:flutter_map/src/layer/tile_layer/tile_provider/network_tile_provider.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_update_event.dart';
 export 'package:flutter_map/src/layer/tile_layer/tile_update_transformer.dart';
+export 'package:flutter_map/src/map/camera/camera.dart';
 export 'package:flutter_map/src/map/camera/camera_constraint.dart';
 export 'package:flutter_map/src/map/camera/camera_fit.dart';
 export 'package:flutter_map/src/map/map_controller.dart';
diff --git a/lib/plugin_api.dart b/lib/plugin_api.dart
index c52513066..628c08fde 100644
--- a/lib/plugin_api.dart
+++ b/lib/plugin_api.dart
@@ -1,8 +1,5 @@
 library flutter_map.plugin_api;
 
 export 'package:flutter_map/flutter_map.dart';
-export 'package:flutter_map/src/map/camera/camera.dart';
-export 'package:flutter_map/src/map/map_controller.dart';
 export 'package:flutter_map/src/misc/private/bounds.dart';
-export 'package:flutter_map/src/misc/private/positioned_tap_detector_2.dart';
 export 'package:flutter_map/src/misc/private/util.dart';
diff --git a/lib/src/layer/attribution_layer/simple.dart b/lib/src/layer/attribution_layer/simple.dart
index e81163e54..19465dd57 100644
--- a/lib/src/layer/attribution_layer/simple.dart
+++ b/lib/src/layer/attribution_layer/simple.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
 
 /// A simple, classic style, attribution widget, to be placed in
 /// [FlutterMap.nonRotatedChildren]
diff --git a/lib/src/layer/overlay_image_layer.dart b/lib/src/layer/overlay_image_layer.dart
index 6eb45e7d4..2099ccb7f 100644
--- a/lib/src/layer/overlay_image_layer.dart
+++ b/lib/src/layer/overlay_image_layer.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
 import 'package:flutter_map/src/map/camera/camera.dart';
 import 'package:flutter_map/src/misc/private/bounds.dart';
 import 'package:latlong2/latlong.dart';
diff --git a/lib/src/layer/polygon_layer.dart b/lib/src/layer/polygon_layer.dart
index d41166efd..9044f732e 100644
--- a/lib/src/layer/polygon_layer.dart
+++ b/lib/src/layer/polygon_layer.dart
@@ -1,7 +1,7 @@
 import 'dart:ui' as ui;
 
 import 'package:flutter/widgets.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
 import 'package:flutter_map/src/layer/label.dart';
 import 'package:flutter_map/src/map/camera/camera.dart';
 import 'package:latlong2/latlong.dart' hide Path; // conflict with Path from UI
diff --git a/lib/src/layer/tile_layer/tile_coordinates.dart b/lib/src/layer/tile_layer/tile_coordinates.dart
index 61929b6f4..35670fbc6 100644
--- a/lib/src/layer/tile_layer/tile_coordinates.dart
+++ b/lib/src/layer/tile_layer/tile_coordinates.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/misc/point.dart';
 
 class TileCoordinates extends CustomPoint<int> {
   final int z;
diff --git a/lib/src/layer/tile_layer/tile_provider/network_tile_provider.dart b/lib/src/layer/tile_layer/tile_provider/network_tile_provider.dart
index 420e9b256..2bf1c62ec 100644
--- a/lib/src/layer/tile_layer/tile_provider/network_tile_provider.dart
+++ b/lib/src/layer/tile_layer/tile_provider/network_tile_provider.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/rendering.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_layer.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_provider/base_tile_provider.dart';
 import 'package:flutter_map/src/layer/tile_layer/tile_provider/network_image_provider.dart';
 import 'package:http/http.dart';
 import 'package:http/retry.dart';
diff --git a/lib/src/map/map_controller.dart b/lib/src/map/map_controller.dart
index cf75deb80..e29cecc0d 100644
--- a/lib/src/map/map_controller.dart
+++ b/lib/src/map/map_controller.dart
@@ -1,10 +1,16 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
+import 'package:flutter_map/src/gestures/map_events.dart';
 import 'package:flutter_map/src/map/camera/camera.dart';
+import 'package:flutter_map/src/map/camera/camera_fit.dart';
 import 'package:flutter_map/src/map/inherited_model.dart';
 import 'package:flutter_map/src/map/map_controller_impl.dart';
+import 'package:flutter_map/src/misc/center_zoom.dart';
+import 'package:flutter_map/src/misc/fit_bounds_options.dart';
+import 'package:flutter_map/src/misc/move_and_rotate_result.dart';
+import 'package:flutter_map/src/misc/point.dart';
 import 'package:latlong2/latlong.dart';
 
 /// Controller to programmatically interact with [FlutterMap], such as
diff --git a/lib/src/misc/position.dart b/lib/src/misc/position.dart
index 6f9bff191..adb88404a 100644
--- a/lib/src/misc/position.dart
+++ b/lib/src/misc/position.dart
@@ -1,4 +1,4 @@
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
 import 'package:latlong2/latlong.dart';
 
 class MapPosition {
diff --git a/test/flutter_map_controller_test.dart b/test/flutter_map_controller_test.dart
index 42f237d7b..cfaeccb39 100644
--- a/test/flutter_map_controller_test.dart
+++ b/test/flutter_map_controller_test.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/widgets.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/geo/latlng_bounds.dart';
+import 'package:flutter_map/src/map/camera/camera_fit.dart';
+import 'package:flutter_map/src/map/map_controller.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/test/layer/circle_layer_test.dart b/test/layer/circle_layer_test.dart
index ac8194dfc..3a2a30d42 100644
--- a/test/layer/circle_layer_test.dart
+++ b/test/layer/circle_layer_test.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/circle_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/test/layer/marker_layer_test.dart b/test/layer/marker_layer_test.dart
index 825b5294a..92332b700 100644
--- a/test/layer/marker_layer_test.dart
+++ b/test/layer/marker_layer_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/marker_layer.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/test/layer/polygon_layer_test.dart b/test/layer/polygon_layer_test.dart
index ac55b4684..4291039f5 100644
--- a/test/layer/polygon_layer_test.dart
+++ b/test/layer/polygon_layer_test.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/polygon_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/test/layer/polyline_layer_test.dart b/test/layer/polyline_layer_test.dart
index 9fdf43f44..e2290ae70 100644
--- a/test/layer/polyline_layer_test.dart
+++ b/test/layer/polyline_layer_test.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/polyline_layer.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:latlong2/latlong.dart';
 
diff --git a/test/test_utils/test_app.dart b/test/test_utils/test_app.dart
index e2d01e48c..ca0fc6684 100644
--- a/test/test_utils/test_app.dart
+++ b/test/test_utils/test_app.dart
@@ -1,7 +1,16 @@
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
+import 'package:flutter_map/src/layer/circle_layer.dart';
+import 'package:flutter_map/src/layer/marker_layer.dart';
+import 'package:flutter_map/src/layer/polygon_layer.dart';
+import 'package:flutter_map/src/layer/polyline_layer.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_coordinates.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_layer.dart';
+import 'package:flutter_map/src/layer/tile_layer/tile_provider/base_tile_provider.dart';
+import 'package:flutter_map/src/map/map_controller.dart';
+import 'package:flutter_map/src/map/options.dart';
+import 'package:flutter_map/src/map/widget.dart';
 import 'package:latlong2/latlong.dart';
 
 class TestApp extends StatelessWidget {