diff --git a/fishbook/__init__.py b/fishbook/__init__.py
index 237b5a0..a8e8131 100644
--- a/fishbook/__init__.py
+++ b/fishbook/__init__.py
@@ -1,4 +1,4 @@
-from .fishbook import *
-from .reproclasses import BaselineData, FIData
+from .fishbook import Cell, Subject, Stimulus, Dataset, RePro
+import fishbook.reproclasses as repros 
 import fishbook.database as database
-__all__ = ['fishbook', 'database']
\ No newline at end of file
+__all__ = ['fishbook', 'database']