diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..c8e6121
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,6 @@
+# TODO:
+
+- readme
+- tests
+- pyenv
+- mypy/black/etc
diff --git a/{{ cookiecutter.project_name }}/pyproject.toml b/{{ cookiecutter.project_name }}/pyproject.toml
deleted file mode 100644
index 2f8ce77..0000000
--- a/{{ cookiecutter.project_name }}/pyproject.toml	
+++ /dev/null
@@ -1,42 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "{{ cookiecutter.project_slug }}"
-version = "{{ cookiecutter.version }}"
-authors = [
-  { name="{{ cookiecutter.full_name }}", email="{{ cookiecutter.email }}" },
-]
-description = "{{ cookiecutter.project_short_description }}"
-readme = "README.md"
-
-requires-python = ">={{ cookiecutter.python_min_version }}"
-dependencies = []
-
-[project.urls]
-"Homepage" = "{{ cookiecutter.project_url }}"
-"Bug Tracker" = "{{ cookiecutter.project_url }}/issues"
-[histausse@grace-hopper {{ cookiecutter.project_name }}]$ cat ../../pyproject.toml
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "{{ cookiecutter.project_slug }}"
-version = "{{ cookiecutter.version }}"
-authors = [
-  { name="{{ cookiecutter.full_name }}", email="{{ cookiecutter.email }}" },
-]
-description = "{{ cookiecutter.project_short_description }}"
-readme = "README.md"
-
-requires-python = ">={{ cookiecutter.python_min_version }}"
-dependencies = []
-
-[project.urls]
-"Homepage" = "{{ cookiecutter.project_url }}"
-"Bug Tracker" = "{{ cookiecutter.project_url }}/issues"
-
-[project.scripts]
-analyse_artifact = "{{ cookiecutter.project_slug }}.cli:main"
diff --git a/{{ cookiecutter.project_name }}/.gitignore b/{{ cookiecutter.project_slug }}/.gitignore
similarity index 100%
rename from {{ cookiecutter.project_name }}/.gitignore
rename to {{ cookiecutter.project_slug }}/.gitignore
diff --git a/{{ cookiecutter.project_name }}/LICENSE b/{{ cookiecutter.project_slug }}/LICENSE
similarity index 100%
rename from {{ cookiecutter.project_name }}/LICENSE
rename to {{ cookiecutter.project_slug }}/LICENSE
diff --git a/{{ cookiecutter.project_slug }}/pyproject.toml b/{{ cookiecutter.project_slug }}/pyproject.toml
new file mode 100644
index 0000000..cab525d
--- /dev/null
+++ b/{{ cookiecutter.project_slug }}/pyproject.toml	
@@ -0,0 +1,22 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "{{ cookiecutter.project_slug }}"
+version = "{{ cookiecutter.version }}"
+authors = [
+  { name="{{ cookiecutter.full_name }}", email="{{ cookiecutter.email }}" },
+]
+description = "{{ cookiecutter.project_short_description }}"
+readme = "README.md"
+
+requires-python = ">={{ cookiecutter.python_min_version }}"
+dependencies = []
+
+[project.urls]
+"Homepage" = "{{ cookiecutter.project_url }}"
+"Bug Tracker" = "{{ cookiecutter.project_url }}/issues"
+
+[project.scripts]
+analyse_artifact = "{{ cookiecutter.project_slug }}.cli:main"
diff --git a/{{ cookiecutter.project_slug }}/src/{{ cookiecutter.project_slug }}/__init__.py b/{{ cookiecutter.project_slug }}/src/{{ cookiecutter.project_slug }}/__init__.py
new file mode 100644
index 0000000..594e5b7
--- /dev/null
+++ b/{{ cookiecutter.project_slug }}/src/{{ cookiecutter.project_slug }}/__init__.py	
@@ -0,0 +1,3 @@
+__author__ = """{{ cookiecutter.full_name }}"""
+__email__ = '{{ cookiecutter.email }}'
+__version__ = '{{ cookiecutter.version }}'
diff --git a/{{ cookiecutter.project_slug }}/src/{{ cookiecutter.project_slug }}/cli.py b/{{ cookiecutter.project_slug }}/src/{{ cookiecutter.project_slug }}/cli.py
new file mode 100644
index 0000000..5bc4b0a
--- /dev/null
+++ b/{{ cookiecutter.project_slug }}/src/{{ cookiecutter.project_slug }}/cli.py	
@@ -0,0 +1,9 @@
+import argparse
+
+def main():
+    """ Console entrypoint for {{cookiecutter.project_slug}}."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument('_', nargs='*')
+    args = parser.parse_args()
+    print("Hello word!")
+