diff --git a/feature_list.txt b/feature_list.txt
deleted file mode 100644
index f4a0efd..0000000
--- a/feature_list.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Must allow for automatic normalisation between different diffractograms, must only happen upon reading data
-- 
diff --git a/beamtime/__init__.py b/nafuma/__init__.py
similarity index 100%
rename from beamtime/__init__.py
rename to nafuma/__init__.py
diff --git a/beamtime/auxillary.py b/nafuma/auxillary.py
similarity index 100%
rename from beamtime/auxillary.py
rename to nafuma/auxillary.py
diff --git a/beamtime/electrochemistry/__init__.py b/nafuma/electrochemistry/__init__.py
similarity index 100%
rename from beamtime/electrochemistry/__init__.py
rename to nafuma/electrochemistry/__init__.py
diff --git a/beamtime/electrochemistry/io.py b/nafuma/electrochemistry/io.py
similarity index 100%
rename from beamtime/electrochemistry/io.py
rename to nafuma/electrochemistry/io.py
diff --git a/beamtime/electrochemistry/plot.py b/nafuma/electrochemistry/plot.py
similarity index 100%
rename from beamtime/electrochemistry/plot.py
rename to nafuma/electrochemistry/plot.py
diff --git a/beamtime/electrochemistry/unit_tables.py b/nafuma/electrochemistry/unit_tables.py
similarity index 100%
rename from beamtime/electrochemistry/unit_tables.py
rename to nafuma/electrochemistry/unit_tables.py
diff --git a/beamtime/pdf/__init__.py b/nafuma/pdf/__init__.py
similarity index 100%
rename from beamtime/pdf/__init__.py
rename to nafuma/pdf/__init__.py
diff --git a/beamtime/plotting.py b/nafuma/plotting.py
similarity index 100%
rename from beamtime/plotting.py
rename to nafuma/plotting.py
diff --git a/beamtime/test.txt b/nafuma/test.txt
similarity index 100%
rename from beamtime/test.txt
rename to nafuma/test.txt
diff --git a/beamtime/test/__init__.py b/nafuma/test/__init__.py
similarity index 100%
rename from beamtime/test/__init__.py
rename to nafuma/test/__init__.py
diff --git a/beamtime/test/pytest.ini b/nafuma/test/pytest.ini
similarity index 100%
rename from beamtime/test/pytest.ini
rename to nafuma/test/pytest.ini
diff --git a/beamtime/test/test_auxillary.py b/nafuma/test/test_auxillary.py
similarity index 100%
rename from beamtime/test/test_auxillary.py
rename to nafuma/test/test_auxillary.py
diff --git a/beamtime/test/test_plotting.py b/nafuma/test/test_plotting.py
similarity index 100%
rename from beamtime/test/test_plotting.py
rename to nafuma/test/test_plotting.py
diff --git a/beamtime/test/xrd/test_io.py b/nafuma/test/xrd/test_io.py
similarity index 100%
rename from beamtime/test/xrd/test_io.py
rename to nafuma/test/xrd/test_io.py
diff --git a/beamtime/test/xrd/test_plot.py b/nafuma/test/xrd/test_plot.py
similarity index 100%
rename from beamtime/test/xrd/test_plot.py
rename to nafuma/test/xrd/test_plot.py
diff --git a/beamtime/test2.txt b/nafuma/test2.txt
similarity index 100%
rename from beamtime/test2.txt
rename to nafuma/test2.txt
diff --git a/beamtime/xanes/__init__.py b/nafuma/xanes/__init__.py
similarity index 100%
rename from beamtime/xanes/__init__.py
rename to nafuma/xanes/__init__.py
diff --git a/beamtime/xanes/calib.py b/nafuma/xanes/calib.py
similarity index 100%
rename from beamtime/xanes/calib.py
rename to nafuma/xanes/calib.py
diff --git a/beamtime/xanes/io.py b/nafuma/xanes/io.py
similarity index 100%
rename from beamtime/xanes/io.py
rename to nafuma/xanes/io.py
diff --git a/beamtime/xrd/__init__.py b/nafuma/xrd/__init__.py
similarity index 100%
rename from beamtime/xrd/__init__.py
rename to nafuma/xrd/__init__.py
diff --git a/beamtime/xrd/io.py b/nafuma/xrd/io.py
similarity index 100%
rename from beamtime/xrd/io.py
rename to nafuma/xrd/io.py
diff --git a/beamtime/xrd/plot.py b/nafuma/xrd/plot.py
similarity index 100%
rename from beamtime/xrd/plot.py
rename to nafuma/xrd/plot.py
diff --git a/beamtime/xrd/test.txt b/nafuma/xrd/test.txt
similarity index 100%
rename from beamtime/xrd/test.txt
rename to nafuma/xrd/test.txt
diff --git a/setup.py b/setup.py
index 4c93b78..b3f9f34 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +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',
+setup(name='nafuma',
+      version='0.2',
+      description='Analysis tools for inorganic materials chemistry at the NAFUMA-group at the University of Oslo',
+      url='https://github.com/rasmusthog/nafuma',
       author='Rasmus Vester Thøgersen, Halvor Høen Hval',
-      author_email='rasmusvt@smn.uio.no',
+      author_email='code@rasmusthog.me',
       license='MIT',
       packages=find_packages(),
       zip_safe=False)