diff --git a/base/core/tests/data.py b/base/core/tests/data.py
index d71582c5..09318b51 100644
--- a/base/core/tests/data.py
+++ b/base/core/tests/data.py
@@ -11,7 +11,7 @@
 # data module for tests
 
 from hsutil.str import format_size
-from dupeguru.data import format_path, cmp_value
+from ..data import format_path, cmp_value
 
 COLUMNS = [
     {'attr':'name','display':'Filename'},
diff --git a/base/qt/app.py b/base/qt/app.py
index d0839d0d..fe42878c 100644
--- a/base/qt/app.py
+++ b/base/qt/app.py
@@ -19,9 +19,8 @@ from PyQt4.QtGui import QProgressDialog, QDesktopServices, QFileDialog, QDialog,
 from hsutil import job
 from hsutil.reg import RegistrationRequired
 
-from dupeguru import fs
-from dupeguru.app import (DupeGuru as DupeGuruBase, JOB_SCAN, JOB_LOAD, JOB_MOVE, JOB_COPY, 
-    JOB_DELETE)
+from core import fs
+from core.app import DupeGuru as DupeGuruBase, JOB_SCAN, JOB_LOAD, JOB_MOVE, JOB_COPY, JOB_DELETE
     
 from qtlib.about_box import AboutBox
 from qtlib.progress import Progress
diff --git a/base/qt/main_window.py b/base/qt/main_window.py
index c19416e7..4d6c0c0c 100644
--- a/base/qt/main_window.py
+++ b/base/qt/main_window.py
@@ -13,7 +13,7 @@ from PyQt4.QtGui import (QMainWindow, QMenu, QPixmap, QIcon, QToolButton, QLabel
 
 from hsutil.misc import nonone
 
-from dupeguru.app import NoScannableFileError, AllFilesAreRefError
+from core.app import NoScannableFileError, AllFilesAreRefError
 
 import dg_rc
 from main_window_ui import Ui_MainWindow
diff --git a/me/cocoa/py/dg_cocoa.py b/me/cocoa/py/dg_cocoa.py
index 0bb65ba4..a8a87f50 100644
--- a/me/cocoa/py/dg_cocoa.py
+++ b/me/cocoa/py/dg_cocoa.py
@@ -8,13 +8,13 @@
 import objc
 from AppKit import *
 
-from dupeguru_me.app_cocoa import DupeGuruME
-from dupeguru.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
+from core_me.app_cocoa import DupeGuruME
+from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
     SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
 
 # Fix py2app imports which chokes on relative imports
-from dupeguru_me import app_cocoa, data, fs, scanner
-from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner, fs
+from core_me import app_cocoa, data, fs, scanner
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner, fs
 from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
 from hsutil import conflict
 
diff --git a/me/core/app_cocoa.py b/me/core/app_cocoa.py
index 692f847f..d810d1bf 100644
--- a/me/core/app_cocoa.py
+++ b/me/core/app_cocoa.py
@@ -13,7 +13,7 @@ import time
 
 from hsutil.cocoa import as_fetch
 
-from dupeguru.app_cocoa import JOBID2TITLE, DupeGuru as DupeGuruBase
+from core.app_cocoa import JOBID2TITLE, DupeGuru as DupeGuruBase
 
 from . import data, scanner, fs
 
diff --git a/me/core/data.py b/me/core/data.py
index ad9edda5..14ed0c99 100644
--- a/me/core/data.py
+++ b/me/core/data.py
@@ -8,7 +8,7 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 from hsutil.str import format_time, FT_MINUTES, format_size
-from dupeguru.data import (format_path, format_timestamp, format_words, format_perc, 
+from core.data import (format_path, format_timestamp, format_words, format_perc, 
     format_dupe_count, cmp_value)
 
 COLUMNS = [
diff --git a/me/core/fs.py b/me/core/fs.py
index 0a47e709..9969d4c4 100644
--- a/me/core/fs.py
+++ b/me/core/fs.py
@@ -10,7 +10,7 @@
 
 from hsmedia import mpeg, wma, mp4, ogg, flac, aiff
 from hsutil.str import get_file_ext
-from dupeguru import fs
+from core import fs
 
 TAG_FIELDS = ['audiosize', 'duration', 'bitrate', 'samplerate', 'title', 'artist',
     'album', 'genre', 'year', 'track', 'comment']
diff --git a/me/core/scanner.py b/me/core/scanner.py
index 7fce8427..45c066ba 100644
--- a/me/core/scanner.py
+++ b/me/core/scanner.py
@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from dupeguru.scanner import Scanner as ScannerBase
+from core.scanner import Scanner as ScannerBase
 
 class ScannerME(ScannerBase):
     @staticmethod
diff --git a/me/core/tests/scanner_test.py b/me/core/tests/scanner_test.py
index 6ab32a6d..f14e7856 100644
--- a/me/core/tests/scanner_test.py
+++ b/me/core/tests/scanner_test.py
@@ -10,7 +10,7 @@
 
 from hsutil.path import Path
 
-from dupeguru.engine import getwords
+from core.engine import getwords
 from ..scanner import *
 
 class NamedObject(object):
diff --git a/me/qt/app.py b/me/qt/app.py
index d4c32cdc..62c21f60 100644
--- a/me/qt/app.py
+++ b/me/qt/app.py
@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from dupeguru_me import data, scanner, fs
+from core_me import data, scanner, fs
 
 from base.app import DupeGuru as DupeGuruBase
 from details_dialog import DetailsDialog
diff --git a/me/qt/preferences.py b/me/qt/preferences.py
index 43bf1306..5b4fd535 100644
--- a/me/qt/preferences.py
+++ b/me/qt/preferences.py
@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from dupeguru.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
+from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
     SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
 
 from base.preferences import Preferences as PreferencesBase
diff --git a/me/qt/preferences_dialog.py b/me/qt/preferences_dialog.py
index 11905db1..e47f8aaa 100644
--- a/me/qt/preferences_dialog.py
+++ b/me/qt/preferences_dialog.py
@@ -10,7 +10,7 @@
 from PyQt4.QtCore import SIGNAL, Qt
 from PyQt4.QtGui import QDialog, QDialogButtonBox
 
-from dupeguru.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
+from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
     SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
 
 from preferences_dialog_ui import Ui_PreferencesDialog
diff --git a/pe/cocoa/py/dg_cocoa.py b/pe/cocoa/py/dg_cocoa.py
index 32c5575f..57a6e92f 100644
--- a/pe/cocoa/py/dg_cocoa.py
+++ b/pe/cocoa/py/dg_cocoa.py
@@ -7,11 +7,11 @@
 import objc
 from AppKit import *
 
-from dupeguru_pe import app_cocoa as app_pe_cocoa
+from core_pe import app_cocoa as app_pe_cocoa
 
 # Fix py2app imports which chokes on relative imports
-from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
-from dupeguru_pe import block, cache, matchbase, data
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
+from core_pe import block, cache, matchbase, data
 from hsutil import conflict
 
 class PyApp(NSObject):
diff --git a/pe/core/app_cocoa.py b/pe/core/app_cocoa.py
index 660faa3a..cc3c291d 100644
--- a/pe/core/app_cocoa.py
+++ b/pe/core/app_cocoa.py
@@ -21,8 +21,8 @@ from hsutil.str import get_file_ext
 from hsutil.path import Path
 from hsutil.cocoa import as_fetch
 
-from dupeguru import fs
-from dupeguru import app_cocoa, directories
+from core import fs
+from core import app_cocoa, directories
 from . import data
 from .cache import string_to_colors, Cache
 from .scanner import ScannerPE
diff --git a/pe/core/data.py b/pe/core/data.py
index f13cf14b..356cdf70 100644
--- a/pe/core/data.py
+++ b/pe/core/data.py
@@ -8,7 +8,7 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 from hsutil.str import format_size
-from dupeguru.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value
+from core.data import format_path, format_timestamp, format_perc, format_dupe_count, cmp_value
 
 def format_dimensions(dimensions):
     return '%d x %d' % (dimensions[0], dimensions[1])
diff --git a/pe/core/matchbase.py b/pe/core/matchbase.py
index 8cfae038..4eea13f9 100644
--- a/pe/core/matchbase.py
+++ b/pe/core/matchbase.py
@@ -15,7 +15,7 @@ from collections import defaultdict
 from hsutil import job
 from hsutil.misc import dedupe
 
-from dupeguru.engine import Match
+from core.engine import Match
 from .block import avgdiff, DifferentBlockCountError, NoBlocksError
 from .cache import Cache
 
diff --git a/pe/core/scanner.py b/pe/core/scanner.py
index b25f0011..9e1c8cce 100644
--- a/pe/core/scanner.py
+++ b/pe/core/scanner.py
@@ -8,7 +8,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from dupeguru.scanner import Scanner
+from core.scanner import Scanner
 
 from . import matchbase
 
diff --git a/pe/qt/app.py b/pe/qt/app.py
index 4bdee272..39642220 100644
--- a/pe/qt/app.py
+++ b/pe/qt/app.py
@@ -15,10 +15,10 @@ import PIL.Image
 
 from hsutil.str import get_file_ext
 
-from dupeguru import fs
-from dupeguru_pe import data as data_pe
-from dupeguru_pe.cache import Cache
-from dupeguru_pe.scanner import ScannerPE
+from core import fs
+from core_pe import data as data_pe
+from core_pe.cache import Cache
+from core_pe.scanner import ScannerPE
 
 from block import getblocks
 from base.app import DupeGuru as DupeGuruBase
diff --git a/se/cocoa/py/dg_cocoa.py b/se/cocoa/py/dg_cocoa.py
index 11ce95b6..d9444c17 100644
--- a/se/cocoa/py/dg_cocoa.py
+++ b/se/cocoa/py/dg_cocoa.py
@@ -8,12 +8,12 @@
 import objc
 from AppKit import *
 
-from dupeguru_se.app_cocoa import DupeGuru
-from dupeguru import scanner
+from core_se.app_cocoa import DupeGuru
+from core import scanner
 
 # Fix py2app imports with chokes on relative imports
-from dupeguru_se import fs, data
-from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, fs
+from core_se import fs, data
+from core import app, app_cocoa, data, directories, engine, export, ignore, results, fs
 from hsutil import conflict
 
 class PyApp(NSObject):
diff --git a/se/core/app_cocoa.py b/se/core/app_cocoa.py
index 25c33b01..9e0f4e49 100644
--- a/se/core/app_cocoa.py
+++ b/se/core/app_cocoa.py
@@ -18,9 +18,9 @@ from hsutil import io
 from hsutil.path import Path
 from hsutil.str import get_file_ext
 
-from dupeguru import fs
-from dupeguru.app_cocoa import DupeGuru as DupeGuruBase
-from dupeguru.directories import Directories as DirectoriesBase, STATE_EXCLUDED
+from core import fs
+from core.app_cocoa import DupeGuru as DupeGuruBase
+from core.directories import Directories as DirectoriesBase, STATE_EXCLUDED
 from . import data
 from .fs import Bundle as BundleBase
 
diff --git a/se/core/data.py b/se/core/data.py
index dc353319..ff6a4d33 100644
--- a/se/core/data.py
+++ b/se/core/data.py
@@ -8,7 +8,7 @@
 # http://www.hardcoded.net/licenses/hs_license
 
 from hsutil.str import format_size
-from dupeguru.data import (format_path, format_timestamp, format_words, format_perc, 
+from core.data import (format_path, format_timestamp, format_words, format_perc, 
     format_dupe_count, cmp_value)
 
 COLUMNS = [
diff --git a/se/core/fs.py b/se/core/fs.py
index dc7d0025..692d0bb6 100644
--- a/se/core/fs.py
+++ b/se/core/fs.py
@@ -13,7 +13,7 @@ import hashlib
 from hsutil import io
 from hsutil.misc import nonone
 
-from dupeguru import fs
+from core import fs
 
 class Bundle(fs.File):
     """This class is for Mac OSX bundles (.app). Bundles are seen by the OS as
diff --git a/se/core/tests/fs_test.py b/se/core/tests/fs_test.py
index c948ede7..045d40fa 100644
--- a/se/core/tests/fs_test.py
+++ b/se/core/tests/fs_test.py
@@ -13,8 +13,8 @@ import hashlib
 from nose.tools import eq_
 
 from hsutil.testcase import TestCase
-from dupeguru.fs import File
-from dupeguru.tests.directories_test import create_fake_fs
+from core.fs import File
+from core.tests.directories_test import create_fake_fs
 
 from .. import fs
 
diff --git a/se/qt/app.py b/se/qt/app.py
index 2d7f5a17..913b8dba 100644
--- a/se/qt/app.py
+++ b/se/qt/app.py
@@ -7,8 +7,8 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from dupeguru_se import data
-from dupeguru.directories import Directories as DirectoriesBase, STATE_EXCLUDED
+from core_se import data
+from core.directories import Directories as DirectoriesBase, STATE_EXCLUDED
 
 from base.app import DupeGuru as DupeGuruBase
 from details_dialog import DetailsDialog
diff --git a/se/qt/preferences.py b/se/qt/preferences.py
index 0ed1c954..2ebd0e85 100644
--- a/se/qt/preferences.py
+++ b/se/qt/preferences.py
@@ -7,7 +7,7 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-from dupeguru.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
+from core.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
 
 from base.preferences import Preferences as PreferencesBase
 
diff --git a/se/qt/preferences_dialog.py b/se/qt/preferences_dialog.py
index 3a1bf1b0..15fb31fd 100644
--- a/se/qt/preferences_dialog.py
+++ b/se/qt/preferences_dialog.py
@@ -12,7 +12,7 @@ from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from hsutil.misc import tryint
 
-from dupeguru.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
+from core.scanner import SCAN_TYPE_FILENAME, SCAN_TYPE_CONTENT
 
 from preferences_dialog_ui import Ui_PreferencesDialog
 import preferences