diff --git a/MANIFEST.in b/MANIFEST.in
index 5c0e7ce..e403726 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,4 @@
-include settings.ini
-include LICENSE
-include CONTRIBUTING.md
-include README.md
-recursive-exclude * __pycache__
+include src/**
+
+exclude tests/**
+exclude v0.1.8/**
\ No newline at end of file
diff --git a/project.toml b/pyproject.toml
similarity index 85%
rename from project.toml
rename to pyproject.toml
index 9a6c320..b63d7e7 100644
--- a/project.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ license = {text = "Apache-2.0"}
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
-    "Development status" :: 4 - Beta"
+    "Development Status :: 4 - Beta"
 ]
 
 dynamic = ['version']
@@ -35,5 +35,12 @@ Homepage = "https://github.com/dariomalchiodi/mulearn"
 Documentation = "https://mulearn-mr.readthedocs.io/"
 Issues = "https://github.com/dariomalchiodi/mulearn/issues"
 
+[tool.setuptools]
+include-package-data = false
+
 [tool.setuptools.dynamic]
 version = {attr = "mulearn.__version__"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
+exclude = ["tests*", "v0.1.8*"]
diff --git a/mulearn/__init__.py b/src/mulearn/__init__.py
similarity index 99%
rename from mulearn/__init__.py
rename to src/mulearn/__init__.py
index e0176d8..b21058b 100644
--- a/mulearn/__init__.py
+++ b/src/mulearn/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.3.1'
+__version__ = '0.3.2'
 
 
 import copy
diff --git a/mulearn/distributions.py b/src/mulearn/distributions.py
similarity index 100%
rename from mulearn/distributions.py
rename to src/mulearn/distributions.py
diff --git a/mulearn/fuzzifier.py b/src/mulearn/fuzzifier.py
similarity index 100%
rename from mulearn/fuzzifier.py
rename to src/mulearn/fuzzifier.py
diff --git a/mulearn/kernel.py b/src/mulearn/kernel.py
similarity index 100%
rename from mulearn/kernel.py
rename to src/mulearn/kernel.py
diff --git a/mulearn/optimization.py b/src/mulearn/optimization.py
similarity index 100%
rename from mulearn/optimization.py
rename to src/mulearn/optimization.py
diff --git a/test/test_fuzzifier.py b/tests/test_fuzzifier.py
similarity index 100%
rename from test/test_fuzzifier.py
rename to tests/test_fuzzifier.py
diff --git a/test/test_kernel.py b/tests/test_kernel.py
similarity index 100%
rename from test/test_kernel.py
rename to tests/test_kernel.py
diff --git a/test/test_optimization.py b/tests/test_optimization.py
similarity index 100%
rename from test/test_optimization.py
rename to tests/test_optimization.py