diff --git a/cellular_automaton/_automaton.py b/cellular_automaton/automaton.py
similarity index 100%
rename from cellular_automaton/_automaton.py
rename to cellular_automaton/automaton.py
diff --git a/cellular_automaton/_cell.py b/cellular_automaton/cell.py
similarity index 96%
rename from cellular_automaton/_cell.py
rename to cellular_automaton/cell.py
index a260551..85a5d29 100644
--- a/cellular_automaton/_cell.py
+++ b/cellular_automaton/cell.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-import cellular_automaton.cellular_automaton._cell_state as cs
+import cellular_automaton.cellular_automaton.cell_state as cs
 
 
 class Cell:
diff --git a/cellular_automaton/_cell_state.py b/cellular_automaton/cell_state.py
similarity index 100%
rename from cellular_automaton/_cell_state.py
rename to cellular_automaton/cell_state.py
diff --git a/cellular_automaton/display.py b/cellular_automaton/display.py
index d85f351..6d357c3 100644
--- a/cellular_automaton/display.py
+++ b/cellular_automaton/display.py
@@ -18,7 +18,7 @@ import pygame
 import time
 import operator
 
-import cellular_automaton.cellular_automaton._automaton as automaton
+import cellular_automaton.cellular_automaton.automaton as automaton
 
 
 class _CASurface:
diff --git a/cellular_automaton/factory.py b/cellular_automaton/factory.py
index a4909f8..c113372 100644
--- a/cellular_automaton/factory.py
+++ b/cellular_automaton/factory.py
@@ -1,8 +1,8 @@
 from . import Neighborhood, Rule
-from ._automaton import CellularAutomatonProcessor, CellularAutomatonMultiProcessor
-from ._cell import Cell
-from ._state import CellularAutomatonState
-from ._cell_state import CellState, SynchronousCellState
+from .automaton import CellularAutomatonProcessor, CellularAutomatonMultiProcessor
+from .cell import Cell
+from .state import CellularAutomatonState
+from .cell_state import CellState, SynchronousCellState
 from typing import Type
 """
 Copyright 2019 Richard Feistenauer
diff --git a/cellular_automaton/_state.py b/cellular_automaton/state.py
similarity index 100%
rename from cellular_automaton/_state.py
rename to cellular_automaton/state.py
diff --git a/test/test_cell.py b/test/test_cell.py
index ec83879..90af91c 100644
--- a/test/test_cell.py
+++ b/test/test_cell.py
@@ -17,8 +17,8 @@ limitations under the License.
 import sys
 sys.path.append('../..')
 
-from cellular_automaton.cellular_automaton._cell import Cell
-from cellular_automaton.cellular_automaton._cell_state import CellState
+from cellular_automaton.cellular_automaton.cell import Cell
+from cellular_automaton.cellular_automaton.cell_state import CellState
 import unittest
 
 
diff --git a/test/test_cell_state.py b/test/test_cell_state.py
index 0e46d5f..03137d7 100644
--- a/test/test_cell_state.py
+++ b/test/test_cell_state.py
@@ -17,7 +17,7 @@ limitations under the License.
 import sys
 sys.path.append('../..')
 
-from cellular_automaton.cellular_automaton import _cell_state as cell_state
+from cellular_automaton.cellular_automaton import cell_state as cell_state
 import unittest
 
 
diff --git a/test/test_factory.py b/test/test_factory.py
index eee91cc..3ca0479 100644
--- a/test/test_factory.py
+++ b/test/test_factory.py
@@ -18,8 +18,8 @@ import sys
 sys.path.append('../..')
 
 from cellular_automaton.cellular_automaton import *
-from cellular_automaton.cellular_automaton._cell_state import CellState
-from cellular_automaton.cellular_automaton._state import CellularAutomatonState
+from cellular_automaton.cellular_automaton.cell_state import CellState
+from cellular_automaton.cellular_automaton.state import CellularAutomatonState
 import unittest
 import mock