diff --git a/.idea/orm.iml b/.idea/orm.iml
index 0afafb50..5ef6ddeb 100644
--- a/.idea/orm.iml
+++ b/.idea/orm.iml
@@ -16,5 +16,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/angel_orm/CHANGELOG.md b/angel_orm/CHANGELOG.md
index 3a624ab8..f6f92795 100644
--- a/angel_orm/CHANGELOG.md
+++ b/angel_orm/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 1.0.0-alpha+10
+* Split into `angel_orm.dart` and `server.dart`. Prevents DDC failures.
+
 # 1.0.0-alpha+7
 * Added a `@belongsToMany` annotation class.
 * Resolved [#20](https://github.com/angel-dart/orm/issues/20). The
diff --git a/angel_orm/lib/angel_orm.dart b/angel_orm/lib/angel_orm.dart
index 7afd1e53..1af57ece 100644
--- a/angel_orm/lib/angel_orm.dart
+++ b/angel_orm/lib/angel_orm.dart
@@ -1,5 +1,4 @@
 export 'src/annotations.dart';
 export 'src/migration.dart';
-export 'src/pool.dart';
 export 'src/relations.dart';
 export 'src/query.dart';
\ No newline at end of file
diff --git a/angel_orm/lib/server.dart b/angel_orm/lib/server.dart
new file mode 100644
index 00000000..5c0e67fa
--- /dev/null
+++ b/angel_orm/lib/server.dart
@@ -0,0 +1,2 @@
+export 'src/pool.dart';
+export 'angel_orm.dart';
\ No newline at end of file
diff --git a/angel_orm/pubspec.yaml b/angel_orm/pubspec.yaml
index 62df779c..c050994b 100644
--- a/angel_orm/pubspec.yaml
+++ b/angel_orm/pubspec.yaml
@@ -1,5 +1,5 @@
 name: angel_orm
-version: 1.0.0-alpha+9
+version: 1.0.0-alpha+10
 description: Runtime support for Angel's ORM.
 author: Tobe O <thosakwe@gmail.com>
 homepage: https://github.com/angel-dart/orm