diff --git a/app/__init__.py b/app/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/app/browser/buffer.py b/app/browser/buffer.py
index ccc10bf..d425365 100644
--- a/app/browser/buffer.py
+++ b/app/browser/buffer.py
@@ -25,7 +25,7 @@ from PyQt5.QtGui import QColor
 from PyQt5.QtWebKitWidgets import QWebView, QWebPage
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtWebKit import QWebSettings
-from buffer import Buffer
+from core.buffer import Buffer
 
 class BrowserBuffer(Buffer):
     def __init__(self, buffer_id, url):
diff --git a/app/demo/buffer.py b/app/demo/buffer.py
index 733b39d..d4606c6 100644
--- a/app/demo/buffer.py
+++ b/app/demo/buffer.py
@@ -21,7 +21,7 @@
 
 from PyQt5.QtGui import QColor
 from PyQt5.QtWidgets import QPushButton
-from buffer import Buffer
+from core.buffer import Buffer
 
 class DemoBuffer(Buffer):
     def __init__(self, buffer_id, url):
diff --git a/app/imageviewer/buffer.py b/app/imageviewer/buffer.py
index 4fd7aed..7d6b98e 100644
--- a/app/imageviewer/buffer.py
+++ b/app/imageviewer/buffer.py
@@ -24,7 +24,7 @@ from PyQt5.QtGui import QColor, QPixmap, QPainter
 from PyQt5.QtCore import QRect, Qt
 from PyQt5.QtWidgets import QWidget
 import os
-from buffer import Buffer
+from core.buffer import Buffer
 
 class ImageViewerBuffer(Buffer):
     def __init__(self, buffer_id, url):
diff --git a/app/pdfviewer/buffer.py b/app/pdfviewer/buffer.py
index 711ec21..fa5cd89 100644
--- a/app/pdfviewer/buffer.py
+++ b/app/pdfviewer/buffer.py
@@ -24,7 +24,7 @@ from PyQt5.QtGui import QColor, QPixmap
 from PyQt5.QtGui import QPainter
 from PyQt5.QtWidgets import QWidget
 from popplerqt5 import Poppler
-from buffer import Buffer
+from core.buffer import Buffer
 
 class PdfViewerBuffer(Buffer):
     def __init__(self, buffer_id, url):
diff --git a/app/videoplayer/buffer.py b/app/videoplayer/buffer.py
index 93da04e..0532d52 100644
--- a/app/videoplayer/buffer.py
+++ b/app/videoplayer/buffer.py
@@ -24,7 +24,7 @@ from PyQt5.QtGui import QBrush, QColor
 from PyQt5.QtMultimedia import QMediaContent, QMediaPlayer
 from PyQt5.QtMultimediaWidgets import QGraphicsVideoItem
 from PyQt5.QtWidgets import QWidget, QGraphicsScene, QGraphicsView, QVBoxLayout
-from buffer import Buffer
+from core.buffer import Buffer
 
 class VideoPlayerBuffer(Buffer):
     def __init__(self, buffer_id, url):
diff --git a/core/view.py b/core/view.py
index ae6e0e4..fb44c0a 100644
--- a/core/view.py
+++ b/core/view.py
@@ -23,7 +23,7 @@ from PyQt5 import QtCore
 from PyQt5.QtGui import QPainter
 from PyQt5.QtCore import Qt, QEvent
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QGraphicsView
-from xutils import get_xlib_display
+from core.xutils import get_xlib_display
 
 class View(QWidget):
 
@@ -104,4 +104,3 @@ class View(QWidget):
 
     def handle_destroy(self):
         self.destroy()
-        
diff --git a/eaf.el b/eaf.el
index aab3877..cc0408d 100644
--- a/eaf.el
+++ b/eaf.el
@@ -104,7 +104,7 @@
   (use-local-map eaf-mode-map)
   (run-hooks 'eaf-mode-hook))
 
-(defvar eaf-python-file (expand-file-name "eaf.py" (concat (file-name-directory load-file-name) "core")))
+(defvar eaf-python-file (expand-file-name "eaf.py" (file-name-directory load-file-name)))
 
 (defvar eaf-process nil)
 
diff --git a/core/eaf.py b/eaf.py
similarity index 98%
rename from core/eaf.py
rename to eaf.py
index 8cbc7fd..7909dc9 100755
--- a/core/eaf.py
+++ b/eaf.py
@@ -20,22 +20,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from PyQt5.QtWidgets import QApplication
+from app.browser.buffer import BrowserBuffer
+from app.demo.buffer import DemoBuffer
+from app.imageviewer.buffer import ImageViewerBuffer
+from app.pdfviewer.buffer import PdfViewerBuffer
+from app.videoplayer.buffer import VideoPlayerBuffer
+from core.fake_key_event import fake_key_event
+from core.utils import file_is_image, file_is_video
+from core.view import View
 from dbus.mainloop.glib import DBusGMainLoop
-from fake_key_event import fake_key_event
 from pymediainfo import MediaInfo
-from utils import file_is_image, file_is_video
-from view import View
 import dbus
 import dbus.service
-
-import os,sys
-sys.path.append("..")
-
-from app.browser.buffer import BrowserBuffer
-from app.imageviewer.buffer import ImageViewerBuffer
-from app.videoplayer.buffer import VideoPlayerBuffer
-from app.pdfviewer.buffer import PdfViewerBuffer
-from app.demo.buffer import DemoBuffer
+import os
 
 EAF_DBUS_NAME = "com.lazycat.eaf"
 EAF_OBJECT_NAME = "/com/lazycat/eaf"