diff --git a/app.py b/sclack/app.py
similarity index 99%
rename from app.py
rename to sclack/app.py
index e81d175..10f1d78 100755
--- a/app.py
+++ b/sclack/app.py
@@ -10,6 +10,7 @@
 import traceback
 import tempfile
 import urwid
+import signal
 from datetime import datetime
 from sclack.components import Attachment, Channel, ChannelHeader, ChatBox, Dm
 from sclack.components import Indicators, MarkdownText, MessageBox
@@ -62,6 +63,7 @@ def __init__(self, config):
         self.set_snooze_widget = None
         self.workspaces = list(config['workspaces'].items())
         self.store = Store(self.workspaces, self.config)
+        signal.signal(signal.SIGINT, self.quit_application)
         Store.instance = self.store
         urwid.set_encoding('UTF-8')
         sidebar = LoadingSideBar()
@@ -907,7 +909,7 @@ def configure_screen(self, screen):
         if self.workspaces_line is not None:
             urwid.connect_signal(self.workspaces_line, 'switch_workspace', self.switch_to_workspace)
 
-    def quit_application(self):
+    def quit_application(self, *args):
         self.urwid_loop.stop()
         if hasattr(self, 'real_time_task'):
             self.real_time_task.cancel()
@@ -930,10 +932,15 @@ def ask_for_token(json_config):
             config_file.write(json.dumps(token_config, indent=False))
             json_config.update(token_config)
 
-if __name__ == '__main__':
+def run():
     json_config = {}
-    with open('./config.json', 'r') as config_file:
+    config_file = os.path.join(
+        os.path.dirname(os.path.realpath(__file__)), 'config.json')
+    with open(config_file, 'r') as config_file:
         json_config.update(json.load(config_file))
     ask_for_token(json_config)
     app = App(json_config)
     app.start()
+
+if __name__ == '__main__':
+    run()
diff --git a/config.json b/sclack/config.json
similarity index 100%
rename from config.json
rename to sclack/config.json
diff --git a/setup.py b/setup.py
index 9e73b2b..c0418a1 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,14 @@
     author='Marcelo Camargo',
     author_email='marcelocamargo@linuxmail.org',
     url='https://github.com/haskellcamargo/sclack',
-    scripts=["app.py"],
+    entry_points={
+        'console_scripts': [
+            'sclack=sclack.app:run',
+        ],
+    },
+    package_data={
+        'sclack': ['config.json']
+    },
     packages=find_packages(),
     install_requires=[
         'asyncio',