diff --git a/src/python/python_fmpi/src/MANIFEST b/src/python/python_fmpi/src/MANIFEST
new file mode 100644
index 0000000..9e9d30b
--- /dev/null
+++ b/src/python/python_fmpi/src/MANIFEST
@@ -0,0 +1,23 @@
+# file GENERATED by distutils, do NOT edit
+main.py
+setup.py
+fmpi/__init__.py
+fmpi/config/__init__.py
+fmpi/config/commands.py
+fmpi/config/stream_list.py
+fmpi/config/ui_config.py
+fmpi/ui/__init__.py
+fmpi/ui/console/__init__.py
+fmpi/ui/console/console.py
+fmpi/ui/console/button/__init__.py
+fmpi/ui/console/button/click_button.py
+fmpi/ui/console/button/console_button.py
+fmpi/ui/console/button/exit_button.py
+fmpi/ui/console/button/play_stream_button.py
+fmpi/ui/console/menu/__init__.py
+fmpi/ui/console/menu/console_menu.py
+fmpi/ui/console/menu/stream_list_menu.py
+fmpi/utility/__init__.py
+fmpi/utility/subprocess_dict.py
+fmpi/web_streams/__init__.py
+fmpi/web_streams/web_stream_player.py
diff --git a/src/python/python_fmpi/src/MANIFEST.in b/src/python/python_fmpi/src/MANIFEST.in
index 0e376c2..8061cef 100644
--- a/src/python/python_fmpi/src/MANIFEST.in
+++ b/src/python/python_fmpi/src/MANIFEST.in
@@ -1,22 +1 @@
-# file GENERATED by distutils, do NOT edit
-setup.py
-fmpi/__init__.py
-fmpi/config/__init__.py
-fmpi/config/commands.py
-fmpi/config/stream_list.py
-fmpi/config/ui_config.py
-fmpi/ui/__init__.py
-fmpi/ui/console/__init__.py
-fmpi/ui/console/console.py
-fmpi/ui/console/button/__init__.py
-fmpi/ui/console/button/click_button.py
-fmpi/ui/console/button/console_button.py
-fmpi/ui/console/button/exit_button.py
-fmpi/ui/console/button/play_stream_button.py
-fmpi/ui/console/menu/__init__.py
-fmpi/ui/console/menu/console_menu.py
-fmpi/ui/console/menu/stream_list_menu.py
-fmpi/utility/__init__.py
-fmpi/utility/subprocess_dict.py
-fmpi/web_streams/__init__.py
-fmpi/web_streams/web_stream_player.py
+include main.py
\ No newline at end of file
diff --git a/src/python/python_fmpi/src/config/__init__.py b/src/python/python_fmpi/src/config/__init__.py
deleted file mode 100644
index f8bf4e8..0000000
--- a/src/python/python_fmpi/src/config/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__author__ = 'dev'
diff --git a/src/python/python_fmpi/src/config/commands.py b/src/python/python_fmpi/src/config/commands.py
deleted file mode 100644
index 88b1841..0000000
--- a/src/python/python_fmpi/src/config/commands.py
+++ /dev/null
@@ -1,6 +0,0 @@
-__author__ = 'dev'
-
-KEY_WEB_STREAM_PLAYER_COMMAND = "web_stream_player_command"
-VALUE_WEB_STREAM_PLAYER_COMMAND_MPLAYER = "mplayer"
-
-web_stream_commands = {KEY_WEB_STREAM_PLAYER_COMMAND: VALUE_WEB_STREAM_PLAYER_COMMAND_MPLAYER}
\ No newline at end of file
diff --git a/src/python/python_fmpi/src/config/stream_list.py b/src/python/python_fmpi/src/config/stream_list.py
deleted file mode 100644
index 75210fd..0000000
--- a/src/python/python_fmpi/src/config/stream_list.py
+++ /dev/null
@@ -1,6 +0,0 @@
-__author__ = 'dev'
-
-web_stream_list= {
-    "skaworld": "http://stream.laut.fm/skaworld",
-    "skafari ": "http://stream.laut.fm/skafari"
-}
\ No newline at end of file
diff --git a/src/python/python_fmpi/src/config/ui_config.py b/src/python/python_fmpi/src/config/ui_config.py
deleted file mode 100644
index 5165bf4..0000000
--- a/src/python/python_fmpi/src/config/ui_config.py
+++ /dev/null
@@ -1,9 +0,0 @@
-__author__ = 'dev'
-
-KEY_UI_TYPE = "ui_type"
-VALUE_UI_TYPE_CONSOLE = "CONSOLE"
-
-
-ui_settings = {
-    KEY_UI_TYPE: VALUE_UI_TYPE_CONSOLE
-}
\ No newline at end of file
diff --git a/src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py b/src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py
index a029a89..e465469 100644
--- a/src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py
+++ b/src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py
@@ -2,10 +2,10 @@ __author__ = 'dev'
 
 import urwid
 
-from ui.console.button.exit_button import ExitButton
-from ui.console.button.play_stream_button import PlayStreamButton
+from fmpi.ui.console.button.exit_button import ExitButton
+from fmpi.ui.console.button.play_stream_button import PlayStreamButton
 from fmpi.config.stream_list import web_stream_list as wsl
-from web_streams.web_stream_player import WebStreamPlayer
+from fmpi.web_streams.web_stream_player import WebStreamPlayer
 from fmpi.ui.console.menu.console_menu import ConsoleMenu, FOCUS_MAP_REVERSED
 
 
diff --git a/src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py b/src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py
index ad42e73..4aebcae 100644
--- a/src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py
+++ b/src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py
@@ -1,6 +1,6 @@
 __author__ = 'dev'
 
-from config.commands import web_stream_commands as wcmd, KEY_WEB_STREAM_PLAYER_COMMAND
+from fmpi.config.commands import web_stream_commands as wcmd, KEY_WEB_STREAM_PLAYER_COMMAND
 
 from fmpi.config.stream_list import web_stream_list as wsl
 from fmpi.utility.subprocess_dict import SubprocessDict
diff --git a/src/python/python_fmpi/src/main.py b/src/python/python_fmpi/src/main.py
index b2b9ea1..2ccbd63 100644
--- a/src/python/python_fmpi/src/main.py
+++ b/src/python/python_fmpi/src/main.py
@@ -1,8 +1,8 @@
 __author__ = 'dev'
 
-from config.ui_config import ui_settings as ui_setting, KEY_UI_TYPE, VALUE_UI_TYPE_CONSOLE
-import ui.console.console as console
+from fmpi.config.ui_config import ui_settings as ui_setting, KEY_UI_TYPE, VALUE_UI_TYPE_CONSOLE
+import fmpi.ui.console.console
 
 if __name__ == '__main__':
     if ui_setting[KEY_UI_TYPE] == VALUE_UI_TYPE_CONSOLE:
-        console.show_ui()
\ No newline at end of file
+        fmpi.ui.console.console.show_ui()
\ No newline at end of file
diff --git a/src/python/python_fmpi/src/setup.py b/src/python/python_fmpi/src/setup.py
index 073a3eb..d18b3c8 100644
--- a/src/python/python_fmpi/src/setup.py
+++ b/src/python/python_fmpi/src/setup.py
@@ -1,11 +1,10 @@
 from distutils.core import setup
 
 setup(
-    name='python_fmpi',
+    name='fmpi',
     version='0.0.1',
     packages=['fmpi', 'fmpi.ui', 'fmpi.ui.console', 'fmpi.ui.console.menu', 'fmpi.ui.console.button', 'fmpi.config',
               'fmpi.utility', 'fmpi.web_streams'],
-    package_dir={'': 'src'},
     url='none',
     license='none',
     author='dev',
diff --git a/src/python/python_fmpi/test/config/test_commands.py b/src/python/python_fmpi/test/config/test_commands.py
index 5b4f8af..9aa0bc5 100644
--- a/src/python/python_fmpi/test/config/test_commands.py
+++ b/src/python/python_fmpi/test/config/test_commands.py
@@ -2,7 +2,8 @@ __author__ = 'dev'
 
 import unittest
 import subprocess
-from config.commands import web_stream_commands as wcmd
+
+from fmpi.config.commands import web_stream_commands as wcmd
 
 
 class TestCommands(unittest.TestCase):
diff --git a/src/python/python_fmpi/test/config/test_stream_list.py b/src/python/python_fmpi/test/config/test_stream_list.py
index d8c1235..743290c 100644
--- a/src/python/python_fmpi/test/config/test_stream_list.py
+++ b/src/python/python_fmpi/test/config/test_stream_list.py
@@ -3,7 +3,8 @@ __author__ = 'dev'
 import unittest
 import urllib.request
 import urllib.error
-from config.stream_list import web_stream_list as wsl
+
+from fmpi.config.stream_list import web_stream_list as wsl
 
 
 class TestStreamList(unittest.TestCase):
diff --git a/src/python/python_fmpi/test/utility/test_subprocess_dict.py b/src/python/python_fmpi/test/utility/test_subprocess_dict.py
index 6828c1d..2a9e8ed 100644
--- a/src/python/python_fmpi/test/utility/test_subprocess_dict.py
+++ b/src/python/python_fmpi/test/utility/test_subprocess_dict.py
@@ -2,7 +2,9 @@ __author__ = 'dev'
 
 import unittest
 import subprocess
-from utility.subprocess_dict import SubprocessDict
+
+from fmpi.utility.subprocess_dict import SubprocessDict
+
 
 class TestSubprocessDict(unittest.TestCase):
 
diff --git a/src/python/python_fmpi/test/web_streams/test_web_stream_player.py b/src/python/python_fmpi/test/web_streams/test_web_stream_player.py
index 383c262..d8c3a7c 100644
--- a/src/python/python_fmpi/test/web_streams/test_web_stream_player.py
+++ b/src/python/python_fmpi/test/web_streams/test_web_stream_player.py
@@ -1,7 +1,8 @@
 __author__ = 'dev'
 
 import unittest
-from web_streams.web_stream_player import WebStreamPlayer
+
+from fmpi.web_streams.web_stream_player import WebStreamPlayer
 
 
 class TestWebStreamPlayer(unittest.TestCase):