diff --git a/src/oshipka.py b/oshipka.py
similarity index 100%
rename from src/oshipka.py
rename to oshipka.py
diff --git a/src/oshipka/persistance/__init__.py b/persistance/__init__.py
similarity index 100%
rename from src/oshipka/persistance/__init__.py
rename to persistance/__init__.py
diff --git a/src/oshipka/persistance/populate.py b/persistance/populate.py
similarity index 100%
rename from src/oshipka/persistance/populate.py
rename to persistance/populate.py
diff --git a/setup.py b/setup.py
index 142a276..5d27f4f 100644
--- a/setup.py
+++ b/setup.py
@@ -17,13 +17,12 @@ def gen_from_file():
 
 
 setup(name='oshipka',
-      version='0.1',
+      version='0.2',
       description='oshipka',
       url='http://gitlab.com/pisquared/oshipka',
-      author='Flying Circus',
+      author='Daniel Tsvetkov',
       install_requires=gen_from_file(),
       author_email='',
       license='MIT',
       packages=find_packages(),
-      zip_safe=False,
       )
diff --git a/src/__init__.py b/src/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/oshipka/__init__.py b/src/oshipka/__init__.py
deleted file mode 100644
index 4f6f260..0000000
--- a/src/oshipka/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-__all__ = [
-    "webapp",
-    "persistance",
-]
\ No newline at end of file
diff --git a/src/oshipka/webapp/__init__.py b/webapp/__init__.py
similarity index 100%
rename from src/oshipka/webapp/__init__.py
rename to webapp/__init__.py