24 files changed, 11 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 0aa4e4c..a313440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 build/
 dist/
-helpers/__pycache__/
+music_sampler/__pycache__/
 __pycache__/
 .pyinstaller_commit
diff --git a/music_sampler.kv b/music_sampler.kv
index a18eb4e..9057532 100644
--- a/music_sampler.kv
+++ b/music_sampler.kv
@@ -1,5 +1,5 @@
 #:import math math
-#:import h helpers
+#:import h music_sampler
 
 <Key>:
   pad_col_sep: 0 if not self.pad_cols else self.parent.pad_x
diff --git a/music_sampler.py b/music_sampler.py
index f5df2bf..714598a 100644
--- a/music_sampler.py
+++ b/music_sampler.py
@@ -1,6 +1,6 @@
-import helpers
+import music_sampler
 
-helpers.parse_args()
+music_sampler.parse_args()
 
 import kivy
 kivy.require("1.9.1")
@@ -11,10 +11,10 @@ from kivy.properties import ListProperty, StringProperty
 from kivy.clock import Clock
 from kivy.core.window import Window
 from kivy.lang import Builder
-from helpers.key import Key
-from helpers.mapping import Mapping
+from music_sampler.key import Key
+from music_sampler.mapping import Mapping
 
-helpers.register_fonts()
+music_sampler.register_fonts()
 
 class KeyList(RelativeLayout):
     keylist = ListProperty([])
@@ -51,8 +51,8 @@ class PlayList(RelativeLayout):
                 continue
 
             text = "{}/{}".format(
-                    helpers.duration_to_min_sec(music_file.sound_position),
-                    helpers.duration_to_min_sec(music_file.sound_duration))
+                    music_sampler.duration_to_min_sec(music_file.sound_position),
+                    music_sampler.duration_to_min_sec(music_file.sound_duration))
 
             if music_file.is_loaded_paused():
                 self.playlist.append(["⏸", music_file.name, text, False])
@@ -87,5 +87,5 @@ class MusicSamplerApp(App):
         return Screen()
 
 if __name__ == '__main__':
-    Builder.load_file(helpers.path() + "/music_sampler.kv")
+    Builder.load_file(music_sampler.path() + "/music_sampler.kv")
     MusicSamplerApp().run()
diff --git a/music_sampler.spec b/music_sampler.spec
index 0d99dca..3794397 100644
--- a/music_sampler.spec
+++ b/music_sampler.spec
@@ -5,7 +5,7 @@ from kivy.tools.packaging.pyinstaller_hooks import get_deps_minimal,\
 
 import importlib.machinery
 sysfont = importlib.machinery\
-        .SourceFileLoader('sysfont', os.getcwd() + '/helpers/sysfont.py') \
+        .SourceFileLoader('sysfont', os.getcwd() + '/music_sampler/sysfont.py') \
         .load_module()
 
 excluded_and_hidden_modules = get_deps_minimal(
diff --git a/helpers/__init__.py b/music_sampler/__init__.py
index 4827e6c..4827e6c 100644
--- a/helpers/__init__.py
+++ b/music_sampler/__init__.py
diff --git a/helpers/action.py b/music_sampler/action.py
index 4b5a71d..4b5a71d 100644
--- a/helpers/action.py
+++ b/music_sampler/action.py
diff --git a/helpers/actions/__init__.py b/music_sampler/actions/__init__.py
index 658cef0..658cef0 100644
--- a/helpers/actions/__init__.py
+++ b/music_sampler/actions/__init__.py
diff --git a/helpers/actions/interrupt_wait.py b/music_sampler/actions/interrupt_wait.py
index 8f465f0..8f465f0 100644
--- a/helpers/actions/interrupt_wait.py
+++ b/music_sampler/actions/interrupt_wait.py
diff --git a/helpers/actions/pause.py b/music_sampler/actions/pause.py
index bb27734..bb27734 100644
--- a/helpers/actions/pause.py
+++ b/music_sampler/actions/pause.py
diff --git a/helpers/actions/play.py b/music_sampler/actions/play.py
index fdba95b..fdba95b 100644
--- a/helpers/actions/play.py
+++ b/music_sampler/actions/play.py
diff --git a/helpers/actions/run_command.py b/music_sampler/actions/run_command.py
index 1e80c1e..1e80c1e 100644
--- a/helpers/actions/run_command.py
+++ b/music_sampler/actions/run_command.py
diff --git a/helpers/actions/seek.py b/music_sampler/actions/seek.py
index 467af7d..467af7d 100644
--- a/helpers/actions/seek.py
+++ b/music_sampler/actions/seek.py
diff --git a/helpers/actions/stop.py b/music_sampler/actions/stop.py
index 88cc66d..88cc66d 100644
--- a/helpers/actions/stop.py
+++ b/music_sampler/actions/stop.py
diff --git a/helpers/actions/stop_all_actions.py b/music_sampler/actions/stop_all_actions.py
index 4ea875a..4ea875a 100644
--- a/helpers/actions/stop_all_actions.py
+++ b/music_sampler/actions/stop_all_actions.py
diff --git a/helpers/actions/unpause.py b/music_sampler/actions/unpause.py
index 5fa88c3..5fa88c3 100644
--- a/helpers/actions/unpause.py
+++ b/music_sampler/actions/unpause.py
diff --git a/helpers/actions/volume.py b/music_sampler/actions/volume.py
index 7dda3c1..7dda3c1 100644
--- a/helpers/actions/volume.py
+++ b/music_sampler/actions/volume.py
diff --git a/helpers/actions/wait.py b/music_sampler/actions/wait.py
index ea42408..ea42408 100644
--- a/helpers/actions/wait.py
+++ b/music_sampler/actions/wait.py
diff --git a/helpers/key.py b/music_sampler/key.py
index 66e792d..66e792d 100644
--- a/helpers/key.py
+++ b/music_sampler/key.py
diff --git a/helpers/lock.py b/music_sampler/lock.py
index 9beafcd..9beafcd 100644
--- a/helpers/lock.py
+++ b/music_sampler/lock.py
diff --git a/helpers/mapping.py b/music_sampler/mapping.py
index bb20e67..bb20e67 100644
--- a/helpers/mapping.py
+++ b/music_sampler/mapping.py
diff --git a/helpers/mixer.py b/music_sampler/mixer.py
index 9242b61..9242b61 100644
--- a/helpers/mixer.py
+++ b/music_sampler/mixer.py
diff --git a/helpers/music_effect.py b/music_sampler/music_effect.py
index 4bdbb26..4bdbb26 100644
--- a/helpers/music_effect.py
+++ b/music_sampler/music_effect.py
diff --git a/helpers/music_file.py b/music_sampler/music_file.py
index 2d3ba72..2d3ba72 100644
--- a/helpers/music_file.py
+++ b/music_sampler/music_file.py
diff --git a/helpers/sysfont.py b/music_sampler/sysfont.py
index f47693e..f47693e 100644
--- a/helpers/sysfont.py
+++ b/music_sampler/sysfont.py