diff --git a/cookiecutter.json b/cookiecutter.json
index 161f59e..b5e7121 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,10 +1,9 @@
 {
     "project_name": "project_name",
     "repo_name": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
+    "package_name": "{{ cookiecutter.package_name.lower().replace(' ', '_') }}",
     "author_name": "Your name (or your organization/company/team)",
     "description": "A short description of the project.",
     "open_source_license": ["MIT", "BSD-3-Clause", "No license file"],
-    "s3_bucket": "[OPTIONAL] your-bucket-for-syncing-data (do not include 's3://')",
-    "aws_profile": "default",
     "python_interpreter": ["python3", "python"]
 }
diff --git a/{{ cookiecutter.repo_name }}/setup.py b/{{ cookiecutter.repo_name }}/setup.py
index 3fef006..2dee761 100644
--- a/{{ cookiecutter.repo_name }}/setup.py	
+++ b/{{ cookiecutter.repo_name }}/setup.py	
@@ -1,7 +1,7 @@
 from setuptools import find_packages, setup
 
 setup(
-    name='src',
+    name='{{ cookiecutter.package_name }}',
     packages=find_packages(),
     version='0.1.0',
     description='{{ cookiecutter.description }}',
diff --git a/{{ cookiecutter.repo_name }}/src/__init__.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/__init__.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/__init__.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/__init__.py
diff --git a/{{ cookiecutter.repo_name }}/src/data/.gitkeep b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/data/.gitkeep
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/data/.gitkeep
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/data/.gitkeep
diff --git a/{{ cookiecutter.repo_name }}/src/data/__init__.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/data/__init__.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/data/__init__.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/data/__init__.py
diff --git a/{{ cookiecutter.repo_name }}/src/data/make_dataset.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/data/make_dataset.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/data/make_dataset.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/data/make_dataset.py
diff --git a/{{ cookiecutter.repo_name }}/src/features/.gitkeep b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/features/.gitkeep
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/features/.gitkeep
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/features/.gitkeep
diff --git a/{{ cookiecutter.repo_name }}/src/features/__init__.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/features/__init__.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/features/__init__.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/features/__init__.py
diff --git a/{{ cookiecutter.repo_name }}/src/features/build_features.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/features/build_features.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/features/build_features.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/features/build_features.py
diff --git a/{{ cookiecutter.repo_name }}/src/models/.gitkeep b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/.gitkeep
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/models/.gitkeep
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/.gitkeep
diff --git a/{{ cookiecutter.repo_name }}/src/models/__init__.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/__init__.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/models/__init__.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/__init__.py
diff --git a/{{ cookiecutter.repo_name }}/src/models/predict_model.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/predict_model.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/models/predict_model.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/predict_model.py
diff --git a/{{ cookiecutter.repo_name }}/src/models/train_model.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/train_model.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/models/train_model.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/models/train_model.py
diff --git a/{{ cookiecutter.repo_name }}/src/visualization/.gitkeep b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/visualization/.gitkeep
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/visualization/.gitkeep
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/visualization/.gitkeep
diff --git a/{{ cookiecutter.repo_name }}/src/visualization/__init__.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/visualization/__init__.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/visualization/__init__.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/visualization/__init__.py
diff --git a/{{ cookiecutter.repo_name }}/src/visualization/visualize.py b/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/visualization/visualize.py
similarity index 100%
rename from {{ cookiecutter.repo_name }}/src/visualization/visualize.py
rename to {{ cookiecutter.repo_name }}/src/{{ cookiecutter.package_name }}/visualization/visualize.py