diff --git a/.gitignore b/.gitignore
index fdf53f3..6447f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /Tests/
-buildEXE.txt
 MultiMate_Player.pyw
 *.list
 cfg.cfg
-/.idea/
\ No newline at end of file
+/.idea/
+/build/
+/dist/
\ No newline at end of file
diff --git a/MultiMate_Player.py b/MultiMate_Player.py
index 6eac784..2037b61 100644
--- a/MultiMate_Player.py
+++ b/MultiMate_Player.py
@@ -1,11 +1,16 @@
-import random
-import time
+import json
+import os
 import platform
-import sys, subprocess, os
+import random
+import subprocess
+import sys
+import time
 import urllib.parse
 import urllib.request
-import json
 import zipfile
+
+import resources.pafy_fix.pafy as pafy
+
 try:
     import vlc
 except:
@@ -18,8 +23,6 @@ except:
     subprocess.check_call([sys.executable, "-m", "pip", "install", 'youtube_dl'])
     import youtube_dl
 
-import resources.pafy_fix.pafy as pafy
-
 try:
     import requests
 except:
@@ -76,7 +79,7 @@ try:
     rpc.connect()
     if config['showrpc']:
         rpc.update(details="Just started app", state="Nothing is beeing listened...", large_image="multimate",
-               start=time.time())
+               start=int(time.time()))
 except:
     pass
 
@@ -107,7 +110,7 @@ class Ui_MainWindow(QtWidgets.QMainWindow):
         MainWindow.resize(801, 580)
         MainWindow.setMinimumSize(QtCore.QSize(801, 580))
         MainWindow.setMaximumSize(QtCore.QSize(801, 580))
-        MainWindow.setWindowIcon(QtGui.QIcon('resources/MultiMate.ico'))
+        MainWindow.setWindowIcon(QtGui.QIcon('resources/img/MultiMate.ico'))
         self.centralwidget = QtWidgets.QWidget(MainWindow)
         self.centralwidget.setObjectName("centralwidget")
         self.timeline = QtWidgets.QSlider(self.centralwidget)
@@ -130,7 +133,7 @@ class Ui_MainWindow(QtWidgets.QMainWindow):
         self.playpausePicture = QtWidgets.QLabel(self.centralwidget)
         self.playpausePicture.setGeometry(QtCore.QRect(390, 520, 40, 40))
         self.playpausePicture.setText("")
-        self.playpausePicture.setPixmap(QtGui.QPixmap("resources/MultiMate40x40.png"))
+        self.playpausePicture.setPixmap(QtGui.QPixmap("resources/img/MultiMate40x40.png"))
         self.playpausePicture.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
         self.playpausePicture.setObjectName("playpausePicture")
 
@@ -147,7 +150,7 @@ class Ui_MainWindow(QtWidgets.QMainWindow):
         self.prevPicture = QtWidgets.QLabel(self.centralwidget)
         self.prevPicture.setGeometry(QtCore.QRect(340, 520, 40, 40))
         self.prevPicture.setText("")
-        self.prevPicture.setPixmap(QtGui.QPixmap("resources/prev.png"))
+        self.prevPicture.setPixmap(QtGui.QPixmap("resources/img/prev.png"))
         self.prevPicture.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
         self.prevPicture.setObjectName("prevPicture")
         self.nextbutton = QtWidgets.QPushButton(self.centralwidget)
@@ -163,7 +166,7 @@ class Ui_MainWindow(QtWidgets.QMainWindow):
         self.nextPicture = QtWidgets.QLabel(self.centralwidget)
         self.nextPicture.setGeometry(QtCore.QRect(440, 520, 40, 40))
         self.nextPicture.setText("")
-        self.nextPicture.setPixmap(QtGui.QPixmap("resources/next.png"))
+        self.nextPicture.setPixmap(QtGui.QPixmap("resources/img/next.png"))
         self.nextPicture.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
         self.nextPicture.setObjectName("nextPicture")
 
@@ -194,7 +197,7 @@ class Ui_MainWindow(QtWidgets.QMainWindow):
         self.VolDialBG = QtWidgets.QLabel(self.centralwidget)
         self.VolDialBG.setGeometry(QtCore.QRect(720, 0, 81, 81))
         self.VolDialBG.setText("")
-        self.VolDialBG.setPixmap(QtGui.QPixmap("resources/MultiMate80x80.png"))
+        self.VolDialBG.setPixmap(QtGui.QPixmap("resources/img/MultiMate80x80.png"))
         self.VolDialBG.setObjectName("VolDialBG")
         self.playlistsComboBox = QtWidgets.QComboBox(self.centralwidget)
         self.playlistsComboBox.setGeometry(QtCore.QRect(0, 0, 231, 22))
diff --git a/MultiMate_Player.spec b/MultiMate_Player.spec
new file mode 100644
index 0000000..e58abfb
--- /dev/null
+++ b/MultiMate_Player.spec
@@ -0,0 +1,40 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+block_cipher = None
+
+
+a = Analysis(['MultiMate_Player.py'],
+             pathex=[],
+             binaries=[],
+             datas=[],
+             hiddenimports=[],
+             hookspath=[],
+             hooksconfig={},
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher,
+             noarchive=False)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,  
+          [],
+          name='MultiMate_Player',
+          debug=False,
+          bootloader_ignore_signals=False,
+          strip=False,
+          upx=True,
+          upx_exclude=[],
+          runtime_tmpdir=None,
+          console=False,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None , icon='resources\\MultiMate.ico')
diff --git a/build.bat b/build.bat
new file mode 100644
index 0000000..9d42342
--- /dev/null
+++ b/build.bat
@@ -0,0 +1 @@
+pyinstaller --noconfirm --onefile --windowed --icon "resources/MultiMate.ico"  "MultiMate_Player.py"
\ No newline at end of file
diff --git a/resources/MultiMate.ico b/resources/img/MultiMate.ico
similarity index 100%
rename from resources/MultiMate.ico
rename to resources/img/MultiMate.ico
diff --git a/resources/MultiMate.png b/resources/img/MultiMate.png
similarity index 100%
rename from resources/MultiMate.png
rename to resources/img/MultiMate.png
diff --git a/resources/MultiMate40x40.png b/resources/img/MultiMate40x40.png
similarity index 100%
rename from resources/MultiMate40x40.png
rename to resources/img/MultiMate40x40.png
diff --git a/resources/MultiMate80x80.png b/resources/img/MultiMate80x80.png
similarity index 100%
rename from resources/MultiMate80x80.png
rename to resources/img/MultiMate80x80.png
diff --git a/resources/hardplaybutton.png b/resources/img/hardplaybutton.png
similarity index 100%
rename from resources/hardplaybutton.png
rename to resources/img/hardplaybutton.png
diff --git a/resources/hardstopbutton.png b/resources/img/hardstopbutton.png
similarity index 100%
rename from resources/hardstopbutton.png
rename to resources/img/hardstopbutton.png
diff --git a/resources/next.png b/resources/img/next.png
similarity index 100%
rename from resources/next.png
rename to resources/img/next.png
diff --git a/resources/prev.png b/resources/img/prev.png
similarity index 100%
rename from resources/prev.png
rename to resources/img/prev.png