diff --git a/yomichan.pyw b/yomichan.pyw
index 7fa5f63..f7df0bd 100755
--- a/yomichan.pyw
+++ b/yomichan.pyw
@@ -19,7 +19,7 @@
 import sys
 from PyQt4 import QtGui
 from yomichan.lang import japanese
-from yomichan.core.reader import MainWindowReader
+from yomichan.reader import MainWindowReader
 
 
 filename = sys.argv[1] if len(sys.argv) >= 2 else None
diff --git a/yomichan/core/about.py b/yomichan/about.py
similarity index 100%
rename from yomichan/core/about.py
rename to yomichan/about.py
diff --git a/yomichan/core/anki_host.py b/yomichan/anki_host.py
similarity index 100%
rename from yomichan/core/anki_host.py
rename to yomichan/anki_host.py
diff --git a/yomichan/core/constants.py b/yomichan/constants.py
similarity index 100%
rename from yomichan/core/constants.py
rename to yomichan/constants.py
diff --git a/yomichan/core/__init__.py b/yomichan/core/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/yomichan/core/preference_data.py b/yomichan/preference_data.py
similarity index 100%
rename from yomichan/core/preference_data.py
rename to yomichan/preference_data.py
diff --git a/yomichan/core/preferences.py b/yomichan/preferences.py
similarity index 100%
rename from yomichan/core/preferences.py
rename to yomichan/preferences.py
diff --git a/yomichan/core/reader.py b/yomichan/reader.py
similarity index 100%
rename from yomichan/core/reader.py
rename to yomichan/reader.py
diff --git a/yomichan/core/reader_util.py b/yomichan/reader_util.py
similarity index 100%
rename from yomichan/core/reader_util.py
rename to yomichan/reader_util.py
diff --git a/yomichan/core/resources_rc.py b/yomichan/resources_rc.py
similarity index 100%
rename from yomichan/core/resources_rc.py
rename to yomichan/resources_rc.py
diff --git a/yomichan/core/update.py b/yomichan/update.py
similarity index 100%
rename from yomichan/core/update.py
rename to yomichan/update.py
diff --git a/yomichan/core/util.py b/yomichan/util.py
similarity index 100%
rename from yomichan/core/util.py
rename to yomichan/util.py
diff --git a/yomichan_plugin.py b/yomichan_plugin.py
index e801d88..921384f 100644
--- a/yomichan_plugin.py
+++ b/yomichan_plugin.py
@@ -17,10 +17,10 @@
 
 
 from PyQt4 import QtGui, QtCore
+from yomichan import anki_host
 from yomichan.lang import japanese
-from yomichan.core import anki_host
-from yomichan.core.preference_data import Preferences
-from yomichan.core.reader import MainWindowReader
+from yomichan.preference_data import Preferences
+from yomichan.reader import MainWindowReader
 
 
 class YomichanPlugin: