diff --git a/README.md b/beamtime/README.md
similarity index 100%
rename from README.md
rename to beamtime/README.md
diff --git a/__init__.py b/beamtime/__init__.py
similarity index 100%
rename from __init__.py
rename to beamtime/__init__.py
diff --git a/pdf/__init__.py b/beamtime/pdf/__init__.py
similarity index 100%
rename from pdf/__init__.py
rename to beamtime/pdf/__init__.py
diff --git a/beamtime/xanes/__init__.py b/beamtime/xanes/__init__.py
new file mode 100644
index 0000000..0e39ba3
--- /dev/null
+++ b/beamtime/xanes/__init__.py
@@ -0,0 +1 @@
+from . import test
diff --git a/beamtime/xanes/test.py b/beamtime/xanes/test.py
new file mode 100644
index 0000000..9462ba3
--- /dev/null
+++ b/beamtime/xanes/test.py
@@ -0,0 +1,2 @@
+def test_func():
+    print('Hello world!')
diff --git a/xanes/__init__.py b/beamtime/xrd/__init__.py
similarity index 100%
rename from xanes/__init__.py
rename to beamtime/xrd/__init__.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..4c93b78
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,11 @@
+from setuptools import setup, find_packages
+
+setup(name='beamtime',
+      version='0.1',
+      description='Package for process and analysis of beamtime data from SNBL',
+      url='http://github.uio.no/rasmusvt/beamtime',
+      author='Rasmus Vester Thøgersen, Halvor Høen Hval',
+      author_email='rasmusvt@smn.uio.no',
+      license='MIT',
+      packages=find_packages(),
+      zip_safe=False)
diff --git a/xrd/__init__.py b/xrd/__init__.py
deleted file mode 100644
index e69de29..0000000