From 68da758f959359434b4eae93d61caf35acb45b81 Mon Sep 17 00:00:00 2001
From: stubbfel <dev@stubbfel>
Date: Sun, 9 Nov 2014 16:21:46 +0100
Subject: [PATCH 1/2] create dist

---
 src/python/python_fmpi/src/MANIFEST.in        | 22 +++++++++++++++++++
 src/python/python_fmpi/src/config/commands.py |  4 +++-
 .../python_fmpi/src/config/ui_config.py       |  9 ++++++++
 .../python_fmpi/src/{ui => fmpi}/__init__.py  |  0
 .../{ui/console => fmpi/config}/__init__.py   |  0
 .../python_fmpi/src/fmpi/config/commands.py   |  6 +++++
 .../src/fmpi/config/stream_list.py            |  6 +++++
 .../python_fmpi/src/fmpi/config/ui_config.py  |  9 ++++++++
 .../console/button => fmpi/ui}/__init__.py    |  0
 .../menu => fmpi/ui/console}/__init__.py      |  0
 .../ui/console/button}/__init__.py            |  0
 .../ui/console/button/click_button.py         |  2 +-
 .../ui/console/button/console_button.py       |  0
 .../ui/console/button/exit_button.py          |  2 +-
 .../ui/console/button/play_stream_button.py   |  2 +-
 .../src/fmpi/ui/console/console.py            | 10 +++++++++
 .../ui/console/menu}/__init__.py              |  0
 .../ui/console/menu/console_menu.py           |  0
 .../ui/console/menu/stream_list_menu.py       | 12 +++++-----
 .../python_fmpi/src/fmpi/utility/__init__.py  |  1 +
 .../src/{ => fmpi}/utility/subprocess_dict.py |  0
 .../src/fmpi/web_streams/__init__.py          |  1 +
 .../web_streams/web_stream_player.py          | 13 ++++++-----
 src/python/python_fmpi/src/main.py            |  8 +++++++
 src/python/python_fmpi/src/setup.py           | 14 ++++++++++++
 .../python_fmpi/src/ui/console/console.py     |  7 ------
 26 files changed, 105 insertions(+), 23 deletions(-)
 create mode 100644 src/python/python_fmpi/src/MANIFEST.in
 create mode 100644 src/python/python_fmpi/src/config/ui_config.py
 rename src/python/python_fmpi/src/{ui => fmpi}/__init__.py (100%)
 rename src/python/python_fmpi/src/{ui/console => fmpi/config}/__init__.py (100%)
 create mode 100644 src/python/python_fmpi/src/fmpi/config/commands.py
 create mode 100644 src/python/python_fmpi/src/fmpi/config/stream_list.py
 create mode 100644 src/python/python_fmpi/src/fmpi/config/ui_config.py
 rename src/python/python_fmpi/src/{ui/console/button => fmpi/ui}/__init__.py (100%)
 rename src/python/python_fmpi/src/{ui/console/menu => fmpi/ui/console}/__init__.py (100%)
 rename src/python/python_fmpi/src/{utility => fmpi/ui/console/button}/__init__.py (100%)
 rename src/python/python_fmpi/src/{ => fmpi}/ui/console/button/click_button.py (68%)
 rename src/python/python_fmpi/src/{ => fmpi}/ui/console/button/console_button.py (100%)
 rename src/python/python_fmpi/src/{ => fmpi}/ui/console/button/exit_button.py (77%)
 rename src/python/python_fmpi/src/{ => fmpi}/ui/console/button/play_stream_button.py (83%)
 create mode 100644 src/python/python_fmpi/src/fmpi/ui/console/console.py
 rename src/python/python_fmpi/src/{web_streams => fmpi/ui/console/menu}/__init__.py (100%)
 rename src/python/python_fmpi/src/{ => fmpi}/ui/console/menu/console_menu.py (100%)
 rename src/python/python_fmpi/src/{ => fmpi}/ui/console/menu/stream_list_menu.py (73%)
 create mode 100644 src/python/python_fmpi/src/fmpi/utility/__init__.py
 rename src/python/python_fmpi/src/{ => fmpi}/utility/subprocess_dict.py (100%)
 create mode 100644 src/python/python_fmpi/src/fmpi/web_streams/__init__.py
 rename src/python/python_fmpi/src/{ => fmpi}/web_streams/web_stream_player.py (73%)
 create mode 100644 src/python/python_fmpi/src/main.py
 create mode 100644 src/python/python_fmpi/src/setup.py
 delete mode 100644 src/python/python_fmpi/src/ui/console/console.py

diff --git a/src/python/python_fmpi/src/MANIFEST.in b/src/python/python_fmpi/src/MANIFEST.in
new file mode 100644
index 0000000..0e376c2
--- /dev/null
+++ b/src/python/python_fmpi/src/MANIFEST.in
@@ -0,0 +1,22 @@
+# 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
diff --git a/src/python/python_fmpi/src/config/commands.py b/src/python/python_fmpi/src/config/commands.py
index f87ba54..88b1841 100644
--- a/src/python/python_fmpi/src/config/commands.py
+++ b/src/python/python_fmpi/src/config/commands.py
@@ -1,4 +1,6 @@
 __author__ = 'dev'
 
+KEY_WEB_STREAM_PLAYER_COMMAND = "web_stream_player_command"
+VALUE_WEB_STREAM_PLAYER_COMMAND_MPLAYER = "mplayer"
 
-web_stream_commands = {"web_stream_player_command": "mplayer"}
\ No newline at end of file
+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/ui_config.py b/src/python/python_fmpi/src/config/ui_config.py
new file mode 100644
index 0000000..5165bf4
--- /dev/null
+++ b/src/python/python_fmpi/src/config/ui_config.py
@@ -0,0 +1,9 @@
+__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/ui/__init__.py b/src/python/python_fmpi/src/fmpi/__init__.py
similarity index 100%
rename from src/python/python_fmpi/src/ui/__init__.py
rename to src/python/python_fmpi/src/fmpi/__init__.py
diff --git a/src/python/python_fmpi/src/ui/console/__init__.py b/src/python/python_fmpi/src/fmpi/config/__init__.py
similarity index 100%
rename from src/python/python_fmpi/src/ui/console/__init__.py
rename to src/python/python_fmpi/src/fmpi/config/__init__.py
diff --git a/src/python/python_fmpi/src/fmpi/config/commands.py b/src/python/python_fmpi/src/fmpi/config/commands.py
new file mode 100644
index 0000000..88b1841
--- /dev/null
+++ b/src/python/python_fmpi/src/fmpi/config/commands.py
@@ -0,0 +1,6 @@
+__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/fmpi/config/stream_list.py b/src/python/python_fmpi/src/fmpi/config/stream_list.py
new file mode 100644
index 0000000..75210fd
--- /dev/null
+++ b/src/python/python_fmpi/src/fmpi/config/stream_list.py
@@ -0,0 +1,6 @@
+__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/fmpi/config/ui_config.py b/src/python/python_fmpi/src/fmpi/config/ui_config.py
new file mode 100644
index 0000000..5165bf4
--- /dev/null
+++ b/src/python/python_fmpi/src/fmpi/config/ui_config.py
@@ -0,0 +1,9 @@
+__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/ui/console/button/__init__.py b/src/python/python_fmpi/src/fmpi/ui/__init__.py
similarity index 100%
rename from src/python/python_fmpi/src/ui/console/button/__init__.py
rename to src/python/python_fmpi/src/fmpi/ui/__init__.py
diff --git a/src/python/python_fmpi/src/ui/console/menu/__init__.py b/src/python/python_fmpi/src/fmpi/ui/console/__init__.py
similarity index 100%
rename from src/python/python_fmpi/src/ui/console/menu/__init__.py
rename to src/python/python_fmpi/src/fmpi/ui/console/__init__.py
diff --git a/src/python/python_fmpi/src/utility/__init__.py b/src/python/python_fmpi/src/fmpi/ui/console/button/__init__.py
similarity index 100%
rename from src/python/python_fmpi/src/utility/__init__.py
rename to src/python/python_fmpi/src/fmpi/ui/console/button/__init__.py
diff --git a/src/python/python_fmpi/src/ui/console/button/click_button.py b/src/python/python_fmpi/src/fmpi/ui/console/button/click_button.py
similarity index 68%
rename from src/python/python_fmpi/src/ui/console/button/click_button.py
rename to src/python/python_fmpi/src/fmpi/ui/console/button/click_button.py
index df54835..1cc7ddd 100644
--- a/src/python/python_fmpi/src/ui/console/button/click_button.py
+++ b/src/python/python_fmpi/src/fmpi/ui/console/button/click_button.py
@@ -1,5 +1,5 @@
 __author__ = 'dev'
-from ui.console.button.console_button import ConsoleButton
+from fmpi.ui.console.button.console_button import ConsoleButton
 
 SIGNAL_NAME = "click"
 
diff --git a/src/python/python_fmpi/src/ui/console/button/console_button.py b/src/python/python_fmpi/src/fmpi/ui/console/button/console_button.py
similarity index 100%
rename from src/python/python_fmpi/src/ui/console/button/console_button.py
rename to src/python/python_fmpi/src/fmpi/ui/console/button/console_button.py
diff --git a/src/python/python_fmpi/src/ui/console/button/exit_button.py b/src/python/python_fmpi/src/fmpi/ui/console/button/exit_button.py
similarity index 77%
rename from src/python/python_fmpi/src/ui/console/button/exit_button.py
rename to src/python/python_fmpi/src/fmpi/ui/console/button/exit_button.py
index 1fc9881..7a869ea 100644
--- a/src/python/python_fmpi/src/ui/console/button/exit_button.py
+++ b/src/python/python_fmpi/src/fmpi/ui/console/button/exit_button.py
@@ -1,7 +1,7 @@
 __author__ = 'dev'
 import urwid
 
-from ui.console.button.click_button import ClickButton
+from fmpi.ui.console.button.click_button import ClickButton
 
 
 class ExitButton(ClickButton):
diff --git a/src/python/python_fmpi/src/ui/console/button/play_stream_button.py b/src/python/python_fmpi/src/fmpi/ui/console/button/play_stream_button.py
similarity index 83%
rename from src/python/python_fmpi/src/ui/console/button/play_stream_button.py
rename to src/python/python_fmpi/src/fmpi/ui/console/button/play_stream_button.py
index b7bae33..c47a88b 100644
--- a/src/python/python_fmpi/src/ui/console/button/play_stream_button.py
+++ b/src/python/python_fmpi/src/fmpi/ui/console/button/play_stream_button.py
@@ -1,5 +1,5 @@
 __author__ = 'dev'
-from ui.console.button.click_button import ClickButton
+from fmpi.ui.console.button.click_button import ClickButton
 
 
 class PlayStreamButton(ClickButton):
diff --git a/src/python/python_fmpi/src/fmpi/ui/console/console.py b/src/python/python_fmpi/src/fmpi/ui/console/console.py
new file mode 100644
index 0000000..d3bd2a0
--- /dev/null
+++ b/src/python/python_fmpi/src/fmpi/ui/console/console.py
@@ -0,0 +1,10 @@
+__author__ = 'dev'
+from fmpi.ui.console.menu.stream_list_menu import StreamListMenu
+
+
+def show_ui():
+    StreamListMenu().show(palette=[('reversed', 'standout', '')])
+
+
+if __name__ == '__main__':
+    show_ui()
diff --git a/src/python/python_fmpi/src/web_streams/__init__.py b/src/python/python_fmpi/src/fmpi/ui/console/menu/__init__.py
similarity index 100%
rename from src/python/python_fmpi/src/web_streams/__init__.py
rename to src/python/python_fmpi/src/fmpi/ui/console/menu/__init__.py
diff --git a/src/python/python_fmpi/src/ui/console/menu/console_menu.py b/src/python/python_fmpi/src/fmpi/ui/console/menu/console_menu.py
similarity index 100%
rename from src/python/python_fmpi/src/ui/console/menu/console_menu.py
rename to src/python/python_fmpi/src/fmpi/ui/console/menu/console_menu.py
diff --git a/src/python/python_fmpi/src/ui/console/menu/stream_list_menu.py b/src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py
similarity index 73%
rename from src/python/python_fmpi/src/ui/console/menu/stream_list_menu.py
rename to src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py
index 4428012..a029a89 100644
--- a/src/python/python_fmpi/src/ui/console/menu/stream_list_menu.py
+++ b/src/python/python_fmpi/src/fmpi/ui/console/menu/stream_list_menu.py
@@ -1,11 +1,13 @@
 __author__ = 'dev'
 
 import urwid
+
 from ui.console.button.exit_button import ExitButton
 from ui.console.button.play_stream_button import PlayStreamButton
-from config.stream_list import web_stream_list as wsl
+from fmpi.config.stream_list import web_stream_list as wsl
 from web_streams.web_stream_player import WebStreamPlayer
-from ui.console.menu.console_menu import ConsoleMenu, FOCUS_MAP_REVERSED
+from fmpi.ui.console.menu.console_menu import ConsoleMenu, FOCUS_MAP_REVERSED
+
 
 LISTBOX_TITLE = "Streamlist"
 
@@ -22,11 +24,7 @@ class StreamListMenu(ConsoleMenu):
         body.append(urwid.AttrMap(ExitButton(), None, focus_map=FOCUS_MAP_REVERSED))
         listbox = urwid.ListBox(urwid.SimpleFocusListWalker(body))
 
-        txt = urwid.AttrMap(urwid.Text(u"Hello World"),None)
-        txtBox = urwid.Pile([txt])
-        txtBox.widget_list.append(txt)
-
-        return urwid.Pile([listbox, txtBox])
+        return listbox
 
     def _clean_menu(self):
         if self.__player is not None:
diff --git a/src/python/python_fmpi/src/fmpi/utility/__init__.py b/src/python/python_fmpi/src/fmpi/utility/__init__.py
new file mode 100644
index 0000000..f8bf4e8
--- /dev/null
+++ b/src/python/python_fmpi/src/fmpi/utility/__init__.py
@@ -0,0 +1 @@
+__author__ = 'dev'
diff --git a/src/python/python_fmpi/src/utility/subprocess_dict.py b/src/python/python_fmpi/src/fmpi/utility/subprocess_dict.py
similarity index 100%
rename from src/python/python_fmpi/src/utility/subprocess_dict.py
rename to src/python/python_fmpi/src/fmpi/utility/subprocess_dict.py
diff --git a/src/python/python_fmpi/src/fmpi/web_streams/__init__.py b/src/python/python_fmpi/src/fmpi/web_streams/__init__.py
new file mode 100644
index 0000000..f8bf4e8
--- /dev/null
+++ b/src/python/python_fmpi/src/fmpi/web_streams/__init__.py
@@ -0,0 +1 @@
+__author__ = 'dev'
diff --git a/src/python/python_fmpi/src/web_streams/web_stream_player.py b/src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py
similarity index 73%
rename from src/python/python_fmpi/src/web_streams/web_stream_player.py
rename to src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py
index b7f7afc..ad42e73 100644
--- a/src/python/python_fmpi/src/web_streams/web_stream_player.py
+++ b/src/python/python_fmpi/src/fmpi/web_streams/web_stream_player.py
@@ -1,15 +1,18 @@
 __author__ = 'dev'
-import subprocess
-from config.stream_list import web_stream_list as wsl
-from config.commands import web_stream_commands as wcmd
-from utility.subprocess_dict import SubprocessDict
+
+from 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
+
 
 SDT_OUT_DST = open('/dev/null', 'w')
 SDT_ERR_DST = open('/dev/null', 'w')
 
+
 class WebStreamPlayer:
 
-    def __init__(self, player_command=wcmd["web_stream_player_command"], stream_list=wsl):
+    def __init__(self, player_command=wcmd[KEY_WEB_STREAM_PLAYER_COMMAND], stream_list=wsl):
         self.__player_command = player_command
         self.__stream_list = stream_list
         self.__process_list = SubprocessDict()
diff --git a/src/python/python_fmpi/src/main.py b/src/python/python_fmpi/src/main.py
new file mode 100644
index 0000000..b2b9ea1
--- /dev/null
+++ b/src/python/python_fmpi/src/main.py
@@ -0,0 +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
+
+if __name__ == '__main__':
+    if ui_setting[KEY_UI_TYPE] == VALUE_UI_TYPE_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
new file mode 100644
index 0000000..073a3eb
--- /dev/null
+++ b/src/python/python_fmpi/src/setup.py
@@ -0,0 +1,14 @@
+from distutils.core import setup
+
+setup(
+    name='python_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',
+    author_email='none',
+    description='none'
+)
diff --git a/src/python/python_fmpi/src/ui/console/console.py b/src/python/python_fmpi/src/ui/console/console.py
deleted file mode 100644
index 17fb7ed..0000000
--- a/src/python/python_fmpi/src/ui/console/console.py
+++ /dev/null
@@ -1,7 +0,0 @@
-__author__ = 'dev'
-import sys
-sys.path.append("/home/dev/projects/fmpi/src/python/python_fmpi/src")
-from ui.console.menu.stream_list_menu import StreamListMenu
-
-if __name__ == '__main__':
-    StreamListMenu().show(palette=[('reversed', 'standout', '')])

From 58af7dfdd505541c3cb7fd2a105296c09a03b7aa Mon Sep 17 00:00:00 2001
From: stubbfel <dev@stubbfel>
Date: Sun, 9 Nov 2014 16:22:23 +0100
Subject: [PATCH 2/2] add

---
 src/python/python_fmpi/src/MANIFEST           | 23 +++++++++++++++++++
 src/python/python_fmpi/src/MANIFEST.in        | 23 +------------------
 src/python/python_fmpi/src/config/__init__.py |  1 -
 src/python/python_fmpi/src/config/commands.py |  6 -----
 .../python_fmpi/src/config/stream_list.py     |  6 -----
 .../python_fmpi/src/config/ui_config.py       |  9 --------
 .../fmpi/ui/console/menu/stream_list_menu.py  |  6 ++---
 .../src/fmpi/web_streams/web_stream_player.py |  2 +-
 src/python/python_fmpi/src/main.py            |  6 ++---
 src/python/python_fmpi/src/setup.py           |  3 +--
 .../python_fmpi/test/config/test_commands.py  |  3 ++-
 .../test/config/test_stream_list.py           |  3 ++-
 .../test/utility/test_subprocess_dict.py      |  4 +++-
 .../web_streams/test_web_stream_player.py     |  3 ++-
 14 files changed, 41 insertions(+), 57 deletions(-)
 create mode 100644 src/python/python_fmpi/src/MANIFEST
 delete mode 100644 src/python/python_fmpi/src/config/__init__.py
 delete mode 100644 src/python/python_fmpi/src/config/commands.py
 delete mode 100644 src/python/python_fmpi/src/config/stream_list.py
 delete mode 100644 src/python/python_fmpi/src/config/ui_config.py

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):