diff --git a/__init__.py b/pyblm/__init__.py
similarity index 75%
rename from __init__.py
rename to pyblm/__init__.py
index 42ebe6c..8c651f7 100644
--- a/__init__.py
+++ b/pyblm/__init__.py
@@ -7,8 +7,8 @@ __version__ = '0.0.1'
 
 def test(level=1, verbosity=1):
     import os, sys
-    print 'lplslib is installed in %s' % (os.path.split(__file__)[0],)
-    print 'lpls ib version %s' % (__version__,)
+    print 'pyblm is installed in %s' % (os.path.split(__file__)[0],)
+    print 'pyblm is version %s' % (__version__,)
     print 'Python version %s' % (sys.version.replace('\n', '',),)
     from numpy.testing import NumpyTest
     return NumpyTest().test(level, verbosity)
diff --git a/crossvalidation.py b/pyblm/crossvalidation.py
similarity index 100%
rename from crossvalidation.py
rename to pyblm/crossvalidation.py
diff --git a/engines.py b/pyblm/engines.py
similarity index 100%
rename from engines.py
rename to pyblm/engines.py
diff --git a/statistics.py b/pyblm/statistics.py
similarity index 100%
rename from statistics.py
rename to pyblm/statistics.py
diff --git a/setup.py b/setup.py
index 60debf1..87c8074 100644
--- a/setup.py
+++ b/setup.py
@@ -18,21 +18,21 @@ Development Status :: 4 - Beta
 Environment :: Console
 Intended Audience :: Developers
 Intended Audience :: Science/Research
-License :: OSI Approved :: GPL License
+License :: OSI Approved :: BSD License
 Operating System :: OS Independent
 Programming Language :: Python
 Topic :: Scientific/Engineering
 Topic :: Software Development :: Libraries :: Python Modules
 """
 
-import __init__
+from pyblm import __version__ 
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
-    config = Configuration('lplslib', parent_package, top_path)
+    config = Configuration('', parent_package, top_path)
     config.add_data_dir('tests')
     #config.add_data_files(['lplslib',('COPYING','README')])
-    #config.add_subpackage('lplslib')
+    config.add_subpackage('pyblm')
     return config
 
 if __name__ == "__main__":
@@ -40,11 +40,12 @@ if __name__ == "__main__":
     config = configuration(top_path='').todict() 
     config['author'] = 'Arnar Flatberg'
     config['author_email'] = 'arnar.flatberg at gmail.com'
-    config['short_description'] = short_description
+#    config['short_description'] = short_description
     config['long_description'] = long_description
-    config['url'] = 'http://dev.pvv.org'
-    config['version'] = __init__.__version__
-    config['license'] = 'GPL v2'
+    config['url'] = 'https://dev.pvv.org/projects/pyblm'
+    config['version'] = __version__
+    config['license'] = 'BSD'
     config['platforms'] = ['Linux']
     config['classifiers'] = filter(None, classifiers.split('\n'))
     setup(**config)
+
diff --git a/tests/test_lplsengine.py b/tests/test_lplsengine.py
index 12ab0c5..88b9204 100644
--- a/tests/test_lplsengine.py
+++ b/tests/test_lplsengine.py
@@ -4,7 +4,7 @@ from math import sqrt as msqrt
 
 from numpy.testing import *
 set_package_path()
-from lplslib import lpls
+from pyblm import lpls
 from numpy import dot, eye, random,asarray,empty
 from numpy.random import rand, randn
 from numpy.linalg import svd,norm