diff --git a/src/numbat/api.py b/src/numbat/api.py
index 9ad8ac0..e947ed4 100644
--- a/src/numbat/api.py
+++ b/src/numbat/api.py
@@ -22,12 +22,12 @@
 from datetime import datetime
 from pathlib import Path
 
-from .base import Element, ElementComponent, ElementComponentType, Edge, \
+from .types import Element, ElementComponent, ElementComponentType, Edge, \
     EdgeType, Node, NodeType, Symbol, SymbolType, File, FileContent, \
     LocalSymbol, SourceLocation, SourceLocationType, Occurrence, Error, \
     NameElement, NameHierarchy
 
-from .dao import ComponentAccessDAO, EdgeDAO, ElementComponentDAO, FileDAO, \
+from .db import ComponentAccessDAO, EdgeDAO, ElementComponentDAO, FileDAO, \
     ElementDAO, ErrorDAO, FileContentDAO, LocalSymbolDAO, MetaDAO, \
     NodeDAO, OccurrenceDAO, SourceLocationDAO, SqliteHelper, SymbolDAO
 
diff --git a/src/numbat/db.py b/src/numbat/db.py
index 3c40d9a..ec0aad5 100644
--- a/src/numbat/db.py
+++ b/src/numbat/db.py
@@ -16,7 +16,7 @@
 
 import sqlite3
 
-from .base import Element, ElementComponent, ElementComponentType, Edge, \
+from .types import Element, ElementComponent, ElementComponentType, Edge, \
     EdgeType, Node, NodeType, Symbol, SymbolType, File, FileContent, \
     LocalSymbol, SourceLocation, SourceLocationType, Occurrence, Error, \
     ComponentAccess, ComponentAccessType