diff --git a/.gitignore b/.gitignore
index 3d46b6b..cf47f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 __pychache__
 *.pyc
 *.pyo
+*.egg-info
\ No newline at end of file
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index d519699..0000000
--- a/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# Blub
diff --git a/columbus/__init__.py b/columbus/__init__.py
new file mode 100644
index 0000000..0362742
--- /dev/null
+++ b/columbus/__init__.py
@@ -0,0 +1 @@
+# emtpy
diff --git a/entities.py b/columbus/entities.py
similarity index 100%
rename from entities.py
rename to columbus/entities.py
diff --git a/env.py b/columbus/env.py
similarity index 99%
rename from env.py
rename to columbus/env.py
index 5cf25c0..a44371b 100644
--- a/env.py
+++ b/columbus/env.py
@@ -4,8 +4,7 @@ import numpy as np
 import pygame
 import random as random_dont_use
 import math
-import entities
-import observables
+from columbus import entities, observables
 
 
 class ColumbusEnv(gym.Env):
diff --git a/gym_binding.py b/columbus/gym_binding.py
similarity index 100%
rename from gym_binding.py
rename to columbus/gym_binding.py
diff --git a/humanPlayer.py b/columbus/humanPlayer.py
similarity index 100%
rename from humanPlayer.py
rename to columbus/humanPlayer.py
diff --git a/observables.py b/columbus/observables.py
similarity index 100%
rename from observables.py
rename to columbus/observables.py
diff --git a/setup.py b/setup.py
index 3f38062..b2435fb 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,12 @@
 from setuptools import setup, find_packages
+
 setup(
-    name='Columbus',
-    packages=find_packages(),
+    name='columbus',
+    version='1.0.0',
+    # url='https://github.com/mypackage.git',
+    # author='Author Name',
+    # author_email='author@gmail.com',
+    # description='Description of my package',
+    packages=['.'],
+    # install_requires=['numpy >= 1.11.1', 'matplotlib >= 1.5.1'],
 )