diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4b49caa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+.git
+venv
+.idea
+__pycache__
+test/data/javacores/output/export.xml
+test/data/javacores/output/export.xsl
+tmp
+test/data/javacores-WAIT2/report.xml
+test/data/javacores-WAIT2/report.xsl
+.vscode
+dist
+src/javacore_analyser.egg-info
+reports
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 573029c..d5729df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,8 @@ python:
  - "3.9"
 install:
  - pip install -r requirements.txt
+env:
+ global:
+  - PYTHONPATH=src:test
 script:
- - python -m unittest test.test_javacore test.test_thread_snapshot test.test_javacore_set test.test_java_thread test.test_stack_trace test.test_javacore_analyzer test.test_tips test.test_verbose_gc_parser test.test_gc_collection test.test_code_snapshot_collection
\ No newline at end of file
+ - python -m unittest test.test_javacore test.test_thread_snapshot test.test_javacore_set test.test_java_thread test.test_stack_trace test.test_javacore_analyser test.test_tips test.test_verbose_gc_parser test.test_gc_collection test.test_code_snapshot_collection
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 396630d..b7c2d5e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -81,16 +81,21 @@ To run the tool with sample data perform the following steps:
 When the window appears, add the following commandline to **run parameters**  
 `test/data/javacores /tmp/javacoreanalyser_output`  
 Change the second parameter to the directory where you want the output report be created.
-2. Right click again on **javacore_analyzer.py** and select **Run** or **Debug**.
+2. Right click again on **javacore_analyser.py** and select **Run** or **Debug**.
 
 To run web application:
-1. Right click on **javacore_analyzer_web.py** directory in **Project** view and select **Modify Run Configuration...**.
+1. Right click on **javacore_analyser_web.py** directory in **Project** view and select **Modify Run Configuration...**.
 2. Add the following **Environmental variables:**
    * **DEBUG:True**
    * **REPORTS_DIR:/tmp/web_reports**  
    You can change the report dir to the location when you want to store the report. 
    The application will start on http://localhost:5000
 
+
+## Build pip package 
+Follow the steps from [Packaging projects](https://packaging.python.org/en/latest/tutorials/packaging-projects/).
+Currently Chris has an API keys for test and production pypi
+
 ## Testing
 As default the tests in Pycharm are ran in the current selected directory. However we want to run them in main 
 directory of the tool (**javacore-analyser** directory, not **test** directory). 
diff --git a/README.md b/README.md
index f1f5fd2..97d9037 100644
--- a/README.md
+++ b/README.md
@@ -16,41 +16,57 @@ The tool analyzes Javacores and verbose gc logs and provides some reports like c
 ## Installation and usage
 
 ### Installation:
-The tool requires Python 3.9 or higher plus some packages - see more in [REQUIREMENTS](REQUIREMENTS.md). Despite it is not mandatory, it is recommended in Python to use virtual environment to manage packages.
+The tool requires Python 3.9 or higher plus some packages - see more in [REQUIREMENTS](REQUIREMENTS.md). 
+Despite it is not mandatory, it is recommended in Python to use virtual environment to manage packages.
+
+#### Installing from pip
+This is most common option which you will need in 99% of situations  
 
 Steps:
 1. Download and install Python. Usually the latest version is supported. Search for supported versions in 
 [REQUIREMENTS](REQUIREMENTS.md)
-2. [Download](https://github.com/IBM/javacore-analyser/releases) and unpack the tool.
-3. Create and activate Virtual Environment according to [Creating virtual environments](https://docs.python.org/3/tutorial/venv.html#creating-virtual-environments).
-4. Install all required pip packages. Navigate in command line to unpacked tool and type
-   `pip install -r requirements.txt`
+2. Create and activate Virtual Environment according to [Creating virtual environments](https://docs.python.org/3/tutorial/venv.html#creating-virtual-environments).
+3. Run the following command:
+   `pip install javacore-analyser`  
+    OR
+   `pip install --extra-index-url https://test.pypi.org/simple/ javacore-analyser` - if you want an experimental version
+
+#### Installing from sources
+This is recommended for geeks only:
+1. Repeat steps 1 and 2 from above
+2. Download the project files either from [Releases](https://github.com/IBM/javacore-analyser/releases) or from [main](https://github.com/IBM/javacore-analyser/archive/refs/heads/main.zip)
+3. Extract the code and from code directory execute
+   `pip install .`
 
 ### Running the tool:
 
 #### Running cmd application: 
-1. Activate your created virtual environment according to activate Virtual Environment according to [Creating virtual environments](https://docs.python.org/3/tutorial/venv.html#creating-virtual-environments)
-2. Install the requirements using pip: 
+1. Install application if not done yet
+2. Activate your created virtual environment according to activate Virtual Environment according to [Creating virtual environments](https://docs.python.org/3/tutorial/venv.html#creating-virtual-environments)
+3. Install the requirements using pip: 
  `pip install requirements.txt` 
-3. Navigate in command line to unpacked tool and run the following command:  
-  `python javacore_analyzer.py <input-data> <output-dir>`  
+4. Run the following command from cmd: `javacore-analyser-batch <input-data> <generated-reports-dir>`
 Where `<input-data>` is one of the following:
 * The directory containing javacores and optionally verbose gc
 * Archive (7z, zip, tar.gz, tar.bz2) containing the same
-* List of the javacores separated by `'` character. Optionally you can add `--separator` option to define your own separator.
+* List of the javacores separated by `;` character. Optionally you can add `--separator` option to define your own separator.
 You can type the following command to obtain the help:  
-`python javacore_analyzer.py --help`
+`javacore-analyser-batch --help`
 
 #### Running web application:
-1. Repeat steps 1 and 2 from cmd application
-2. Navigate to unpacked tool and run the following commands: 
+1. Repeat steps 1-3 from cmd application
+2. OPTIONAL: set the following variables:
   ```
   export REPORTS_DIR=/tmp/reports  
-  flask --app javacore_analyser_web run
+  export PORT=5000
   ``` 
- The first command sets the location of the generated reports stored.  
- The second command starts the server which can be accessed by navigating to http://localhost:5000
+ The first parameter sets where the reports need to be stored. If not set, then the `reports` dir will be created in current location.  
+ The first parameter set the port to use by application. If not specified, 5000 will be used.  
+3. Execute the following command from cmd:  
+  `javacore_analyser_web`
 
+  Now you can type (http://localhost:5000/).  
+ 
 <!-- The following are OPTIONAL, but strongly suggested to have in your repository. -->
 <!--
 * [dco.yml](.github/dco.yml) - This enables DCO bot for you, please take a look https://github.com/probot/dco for more details.
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..faaa2d0
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,68 @@
+#
+# Copyright IBM Corp. 2024 - 2024
+# SPDX-License-Identifier: Apache-2.0
+#
+
+[build-system]
+requires = ["hatchling", "versioningit"]
+build-backend = "hatchling.build"
+
+[project]
+dynamic = ["version"]
+name = "javacore_analyser"
+#version = "2.0rc1"
+authors = [
+    { name="Krzysztof Kazmierczyk", email="kazm@ibm.com" },
+    { name="Piotr Aniola", email="Piotr.Aniola@ibm.com" },
+    { name="Tadeusz Janasiewicz", email="t.janasiewicz@ibm.com" },
+]
+description = "The tool to review IBM Javacore files"
+readme = "README.md"
+license = {file = "LICENSE"}
+requires-python = ">=3.9"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3 :: Only",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Environment :: Web Environment",
+    "Framework :: Flask",
+    "Intended Audience :: Customer Service",
+    "Intended Audience :: System Administrators",
+    "Natural Language :: English",
+]
+dependencies = [
+    "py7zr",
+    "lxml",
+    "pyana",
+    "importlib-resources",
+    "flask",
+    "waitress",
+    "tqdm"
+]
+
+[project.scripts]
+javacore_analyser_batch="javacore_analyser.javacore_analyser_batch:main"
+javacore_analyser_web="javacore_analyser.javacore_analyser_web:main"
+
+[project.urls]
+Homepage = "https://github.com/IBM/javacore-analyser"
+Issues = "https://github.com/IBM/javacore-analyser/issues"
+Changelog = "https://github.com/IBM/javacore-analyser/CHANGELOG.md"
+Source = "https://github.com/IBM/javacore-analyser"
+
+[tool.hatch.version]
+source = "versioningit"
+
+[tool.versioningit.format]
+distance = "{next_version}.dev{distance}"
+dirty = "{version}"
+distance-dirty = "{next_version}.dev{distance}"
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 7ad1984..7bc440e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,7 @@
-dicttoxml
 py7zr
 lxml
 pyana
+importlib-resources
+waitress # Production WSGI server
+flask # WSGI server for development the code
 tqdm
diff --git a/src/javacore_analyser/__init__.py b/src/javacore_analyser/__init__.py
new file mode 100644
index 0000000..a4f1d2c
--- /dev/null
+++ b/src/javacore_analyser/__init__.py
@@ -0,0 +1,4 @@
+#
+# Copyright IBM Corp. 2024 - 2024
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/abstract_snapshot_collection.py b/src/javacore_analyser/abstract_snapshot_collection.py
similarity index 100%
rename from abstract_snapshot_collection.py
rename to src/javacore_analyser/abstract_snapshot_collection.py
diff --git a/code_snapshot_collection.py b/src/javacore_analyser/code_snapshot_collection.py
similarity index 92%
rename from code_snapshot_collection.py
rename to src/javacore_analyser/code_snapshot_collection.py
index 792851e..6673c2e 100644
--- a/code_snapshot_collection.py
+++ b/src/javacore_analyser/code_snapshot_collection.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from abstract_snapshot_collection import AbstractSnapshotCollection
-from stack_trace import StackTrace
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser.abstract_snapshot_collection import AbstractSnapshotCollection
+from javacore_analyser.stack_trace import StackTrace
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class CodeSnapshotCollection(AbstractSnapshotCollection):
diff --git a/constants.py b/src/javacore_analyser/constants.py
similarity index 100%
rename from constants.py
rename to src/javacore_analyser/constants.py
diff --git a/data/expand.js b/src/javacore_analyser/data/expand.js
similarity index 100%
rename from data/expand.js
rename to src/javacore_analyser/data/expand.js
diff --git a/data/jquery/chart.js b/src/javacore_analyser/data/jquery/chart.js
similarity index 100%
rename from data/jquery/chart.js
rename to src/javacore_analyser/data/jquery/chart.js
diff --git a/data/jquery/chartjs-adapter-date-fns.bundle.min.js b/src/javacore_analyser/data/jquery/chartjs-adapter-date-fns.bundle.min.js
similarity index 100%
rename from data/jquery/chartjs-adapter-date-fns.bundle.min.js
rename to src/javacore_analyser/data/jquery/chartjs-adapter-date-fns.bundle.min.js
diff --git a/data/jquery/jq.css b/src/javacore_analyser/data/jquery/jq.css
similarity index 100%
rename from data/jquery/jq.css
rename to src/javacore_analyser/data/jquery/jq.css
diff --git a/data/jquery/jquery.mark.min.js b/src/javacore_analyser/data/jquery/jquery.mark.min.js
similarity index 100%
rename from data/jquery/jquery.mark.min.js
rename to src/javacore_analyser/data/jquery/jquery.mark.min.js
diff --git a/data/jquery/jquery.min.js b/src/javacore_analyser/data/jquery/jquery.min.js
similarity index 100%
rename from data/jquery/jquery.min.js
rename to src/javacore_analyser/data/jquery/jquery.min.js
diff --git a/data/jquery/jquery.tablesorter.min.js b/src/javacore_analyser/data/jquery/jquery.tablesorter.min.js
similarity index 100%
rename from data/jquery/jquery.tablesorter.min.js
rename to src/javacore_analyser/data/jquery/jquery.tablesorter.min.js
diff --git a/data/jquery/jquery.tablesorter.widgets.min.js b/src/javacore_analyser/data/jquery/jquery.tablesorter.widgets.min.js
similarity index 100%
rename from data/jquery/jquery.tablesorter.widgets.min.js
rename to src/javacore_analyser/data/jquery/jquery.tablesorter.widgets.min.js
diff --git a/data/jquery/search.js b/src/javacore_analyser/data/jquery/search.js
similarity index 100%
rename from data/jquery/search.js
rename to src/javacore_analyser/data/jquery/search.js
diff --git a/data/jquery/sorting.js b/src/javacore_analyser/data/jquery/sorting.js
similarity index 100%
rename from data/jquery/sorting.js
rename to src/javacore_analyser/data/jquery/sorting.js
diff --git a/data/jquery/theme.blue.css b/src/javacore_analyser/data/jquery/theme.blue.css
similarity index 100%
rename from data/jquery/theme.blue.css
rename to src/javacore_analyser/data/jquery/theme.blue.css
diff --git a/data/jquery/theme.default.min.css b/src/javacore_analyser/data/jquery/theme.default.min.css
similarity index 100%
rename from data/jquery/theme.default.min.css
rename to src/javacore_analyser/data/jquery/theme.default.min.css
diff --git a/data/jquery/wait2scripts.js b/src/javacore_analyser/data/jquery/wait2scripts.js
similarity index 100%
rename from data/jquery/wait2scripts.js
rename to src/javacore_analyser/data/jquery/wait2scripts.js
diff --git a/data/style.css b/src/javacore_analyser/data/style.css
similarity index 100%
rename from data/style.css
rename to src/javacore_analyser/data/style.css
diff --git a/data/xml/index.xml b/src/javacore_analyser/data/xml/index.xml
similarity index 100%
rename from data/xml/index.xml
rename to src/javacore_analyser/data/xml/index.xml
diff --git a/data/xml/javacores/javacore.xml b/src/javacore_analyser/data/xml/javacores/javacore.xml
similarity index 100%
rename from data/xml/javacores/javacore.xml
rename to src/javacore_analyser/data/xml/javacores/javacore.xml
diff --git a/data/xml/javacores/javacore.xsl b/src/javacore_analyser/data/xml/javacores/javacore.xsl
similarity index 100%
rename from data/xml/javacores/javacore.xsl
rename to src/javacore_analyser/data/xml/javacores/javacore.xsl
diff --git a/data/xml/report.xsl b/src/javacore_analyser/data/xml/report.xsl
similarity index 100%
rename from data/xml/report.xsl
rename to src/javacore_analyser/data/xml/report.xsl
diff --git a/data/xml/threads/thread.xml b/src/javacore_analyser/data/xml/threads/thread.xml
similarity index 100%
rename from data/xml/threads/thread.xml
rename to src/javacore_analyser/data/xml/threads/thread.xml
diff --git a/data/xml/threads/thread.xsl b/src/javacore_analyser/data/xml/threads/thread.xsl
similarity index 100%
rename from data/xml/threads/thread.xsl
rename to src/javacore_analyser/data/xml/threads/thread.xsl
diff --git a/java_thread.py b/src/javacore_analyser/java_thread.py
similarity index 98%
rename from java_thread.py
rename to src/javacore_analyser/java_thread.py
index b00a10a..746fccc 100644
--- a/java_thread.py
+++ b/src/javacore_analyser/java_thread.py
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from abstract_snapshot_collection import AbstractSnapshotCollection
+from javacore_analyser.abstract_snapshot_collection import AbstractSnapshotCollection
 
 
 class Thread(AbstractSnapshotCollection):
diff --git a/javacore.py b/src/javacore_analyser/javacore.py
similarity index 97%
rename from javacore.py
rename to src/javacore_analyser/javacore.py
index ad56d07..02e0132 100644
--- a/javacore.py
+++ b/src/javacore_analyser/javacore.py
@@ -8,8 +8,8 @@
 import logging
 import os.path
 
-from constants import THREAD_INFO, DATETIME, SIGINFO, ENCODING
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser.constants import THREAD_INFO, DATETIME, SIGINFO, ENCODING
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class CorruptedJavacoreException(Exception):
diff --git a/javacore_analyzer.py b/src/javacore_analyser/javacore_analyser_batch.py
similarity index 91%
rename from javacore_analyzer.py
rename to src/javacore_analyser/javacore_analyser_batch.py
index 423b1db..6a2b3dd 100644
--- a/javacore_analyzer.py
+++ b/src/javacore_analyser/javacore_analyser_batch.py
@@ -17,16 +17,13 @@
 
 import py7zr
 
-import logging_utils
-from constants import DEFAULT_FILE_DELIMITER
-from javacore_set import JavacoreSet
+from javacore_analyser import logging_utils
+from javacore_analyser.constants import DEFAULT_FILE_DELIMITER
+from javacore_analyser.javacore_set import JavacoreSet
 
 SUPPORTED_ARCHIVES_FORMATS = {"zip", "gz", "tgz", "bz2", "lzma", "7z"}
 
 
-
-
-
 def extract_archive(input_archive_filename, output_path):
     """
 
@@ -56,8 +53,8 @@ def extract_archive(input_archive_filename, output_path):
         logging.info("Processing 7z file")
     else:
         raise Exception("The format of file is not supported. "
-                      "Currently we support only zip, tar.gz, tgz, tar.bz2 and 7z. "
-                      "Cannot proceed.")
+                        "Currently we support only zip, tar.gz, tgz, tar.bz2 and 7z. "
+                        "Cannot proceed.")
 
     file.extractall(path=output_path)
     file.close()
@@ -67,7 +64,7 @@ def extract_archive(input_archive_filename, output_path):
 
 def main():
     logging_utils.create_console_logging()
-    logging.info("Wait2 tool")
+    logging.info("IBM Javacore analyser")
     logging.info("Python version: " + sys.version)
     logging.info("Preferred encoding: " + locale.getpreferredencoding())
 
@@ -75,7 +72,7 @@ def main():
     parser.add_argument("input_param", help="Input file(s) or directory")
     parser.add_argument("output_param", help="Report output directory")
     parser.add_argument("--separator",
-                        help='Input files separator (default "' + DEFAULT_FILE_DELIMITER + '"',
+                        help='Input files separator (default "' + DEFAULT_FILE_DELIMITER + '")',
                         default=DEFAULT_FILE_DELIMITER)
     args = parser.parse_args()
 
@@ -119,8 +116,9 @@ def generate_javecore_set_data(files):
     - JavacoreSet: Generated JavacoreSet object containing the processed data.
     """
 
-    # Location when we store extracted archive or copied javacores files
+
     try:
+        # Location when we store extracted archive or copied javacores files
         javacores_temp_dir = tempfile.TemporaryDirectory()
 
         javacores_temp_dir_name = javacores_temp_dir.name
@@ -139,7 +137,6 @@ def generate_javecore_set_data(files):
         javacores_temp_dir.cleanup()
 
 
-
 # Assisted by WCA@IBM
 # Latest GenAI contribution: ibm/granite-8b-code-instruct
 def process_javacores_and_generate_report_data(input_files, output_dir):
diff --git a/javacore_analyser_web.py b/src/javacore_analyser/javacore_analyser_web.py
similarity index 82%
rename from javacore_analyser_web.py
rename to src/javacore_analyser/javacore_analyser_web.py
index 68c04b8..c9ab9ef 100644
--- a/javacore_analyser_web.py
+++ b/src/javacore_analyser/javacore_analyser_web.py
@@ -13,10 +13,11 @@
 from pathlib import Path
 
 from flask import Flask, render_template, request, send_from_directory, redirect
+from waitress import serve
 
-import javacore_analyzer
-import logging_utils
-from constants import DEFAULT_REPORTS_DIR, DEFAULT_PORT
+import javacore_analyser.javacore_analyser_batch
+from javacore_analyser.constants import DEFAULT_REPORTS_DIR, DEFAULT_PORT
+from javacore_analyser.logging_utils import create_console_logging, create_file_logging
 
 """
 To run the application from cmd type:
@@ -25,13 +26,13 @@
 """
 app = Flask(__name__)
 with app.app_context():
-    logging_utils.create_console_logging()
+    create_console_logging()
     logging.info("Javacore analyser")
     logging.info("Python version: " + sys.version)
     logging.info("Preferred encoding: " + locale.getpreferredencoding())
     reports_dir = os.getenv("REPORTS_DIR", DEFAULT_REPORTS_DIR)
     logging.info("Reports directory: " + reports_dir)
-    logging_utils.create_file_logging(reports_dir)
+    create_file_logging(reports_dir)
 
 
 @app.route('/')
@@ -101,12 +102,20 @@ def upload_file():
 
         # Process the uploaded file
         report_output_dir = reports_dir + '/' + report_name
-        javacore_analyzer.process_javacores_and_generate_report_data(input_files, report_output_dir)
+        javacore_analyser.javacore_analyser_batch.process_javacores_and_generate_report_data(input_files,
+                                                                                             report_output_dir)
 
         return redirect("/reports/" + report_name + "/index.html")
     finally:
         javacores_temp_dir.cleanup()
 
+def main():
+    debug = os.getenv("DEBUG", False)
+    port = os.getenv("PORT", DEFAULT_PORT)
+    if debug:
+        app.run(debug=True, port=port)  # Run Flask for development
+    else:
+        serve(app, port=port)  # Run Waitress in production
 
 if __name__ == '__main__':
     """
@@ -115,4 +124,4 @@ def upload_file():
     PORT - application port
     REPORTS_DIR - the directory when the reports are stored as default
     """
-    app.run(debug=os.getenv("DEBUG", False), port=os.getenv("PORT", DEFAULT_PORT))
+    main()
diff --git a/javacore_set.py b/src/javacore_analyser/javacore_set.py
similarity index 87%
rename from javacore_set.py
rename to src/javacore_analyser/javacore_set.py
index db3196d..c32b040 100644
--- a/javacore_set.py
+++ b/src/javacore_analyser/javacore_set.py
@@ -14,18 +14,41 @@
 from pathlib import Path
 from xml.dom.minidom import parseString
 
+import importlib_resources
+from importlib_resources.abc import Traversable
 from lxml import etree
 from lxml.etree import XMLSyntaxError
 from tqdm import tqdm
 
-import tips
-from code_snapshot_collection import CodeSnapshotCollection
-from constants import *
-from java_thread import Thread
-from javacore import Javacore
-from snapshot_collection import SnapshotCollection
-from snapshot_collection_collection import SnapshotCollectionCollection
-from verbose_gc import VerboseGcParser
+from javacore_analyser import tips
+from javacore_analyser.code_snapshot_collection import CodeSnapshotCollection
+from javacore_analyser.constants import *
+from javacore_analyser.java_thread import Thread
+from javacore_analyser.javacore import Javacore
+from javacore_analyser.snapshot_collection import SnapshotCollection
+from javacore_analyser.snapshot_collection_collection import SnapshotCollectionCollection
+from javacore_analyser.verbose_gc import VerboseGcParser
+
+
+def _create_xml_xsl_for_collection(tmp_dir, templates_dir, xml_xsl_filename, collection, output_file_prefix):
+    logging.info("Creating xmls and xsls in " + tmp_dir)
+    os.mkdir(tmp_dir)
+    extensions = [".xsl", ".xml"]
+    for extension in extensions:
+        file_full_path = os.path.normpath(os.path.join(templates_dir, xml_xsl_filename + extension))
+        if not file_full_path.startswith(templates_dir):
+            raise Exception("Security exception: Uncontrolled data used in path expression")
+        file_content = Path(file_full_path).read_text()
+        for element in collection:
+            element_id = element.get_id()
+            filename = output_file_prefix + "_" + str(element_id) + extension
+            if filename.startswith("_"):
+                filename = filename[1:]
+            file = os.path.join(tmp_dir, filename)
+            logging.debug("Writing file " + file)
+            f = open(file, "w")
+            f.write(file_content.format(id=element_id))
+            f.close()
 
 
 class JavacoreSet:
@@ -112,29 +135,35 @@ def generate_report_files(self, output_dir):
     def __create_output_files_structure(self, output_dir):
         if not os.path.isdir(output_dir):
             os.mkdir(output_dir)
-        data_dir = output_dir + '/data'
-        if os.path.isdir(data_dir):
-            shutil.rmtree(data_dir, ignore_errors=True)
-        logging.info("Data dir: " + data_dir)
-        shutil.copytree("data", data_dir, dirs_exist_ok=True)
+        data_output_dir = os.path.normpath(os.path.join(output_dir, 'data'))
+        if not data_output_dir.startswith(output_dir):
+            raise Exception("Security exception: Uncontrolled data used in path expression")
+        if os.path.isdir(data_output_dir):
+            shutil.rmtree(data_output_dir, ignore_errors=True)
+        logging.info("Data dir: " + data_output_dir)
+
+        style_css_resource: Traversable = importlib_resources.files("javacore_analyser") / "data" / "style.css"
+        data_dir = os.path.dirname(style_css_resource)
+        os.mkdir(data_output_dir)
+        shutil.copytree(data_dir, data_output_dir, dirs_exist_ok=True)
 
     def __generate_htmls_for_threads(self, output_dir, temp_dir_name):
-        self.create_xml_xsl_for_collection(temp_dir_name + "/threads",
-                                           "data/xml/threads/thread",
-                                           self.threads,
-                                           "thread")
+        _create_xml_xsl_for_collection(os.path.join(temp_dir_name, "threads"),
+                                       os.path.join(output_dir, "data", "xml", "threads"), "thread",
+                                       self.threads,
+                                       "thread")
         self.generate_htmls_from_xmls_xsls(self.report_xml_file,
-                                           temp_dir_name + "/threads",
-                                           output_dir + "/threads", )
+                                           os.path.join(temp_dir_name, "threads"),
+                                           os.path.join(output_dir, "threads"))
 
     def __generate_htmls_for_javacores(self, output_dir, temp_dir_name):
-        self.create_xml_xsl_for_collection(temp_dir_name + "/javacores",
-                                           "data/xml/javacores/javacore",
-                                           self.javacores,
-                                           "")
+        _create_xml_xsl_for_collection(os.path.join(temp_dir_name, "javacores"),
+                                       os.path.join(output_dir, "data", "xml", "javacores"), "javacore",
+                                       self.javacores,
+                                       "")
         self.generate_htmls_from_xmls_xsls(self.report_xml_file,
-                                           temp_dir_name + "/javacores",
-                                           output_dir + "/javacores", )
+                                           os.path.join(temp_dir_name, "javacores"),
+                                           os.path.join(output_dir, "javacores"))
 
     def populate_snapshot_collections(self):
         for javacore in self.javacores:
@@ -236,7 +265,7 @@ def parse_common_data(self, filename):
 
     def parse_javacores(self):
         """ creates a Javacore object for each javacore...txt file in the given path """
-        for filename in tqdm(self.files, "Parsing Javacore files", unit=" javacores"):
+        for filename in self.files:
             filename = os.path.join(self.path, filename)
             javacore = Javacore()
             javacore.create(filename, self)
@@ -454,12 +483,23 @@ def get_javacore_set_in_xml(self):
         finally:
             file.close()
 
+    @staticmethod
+    def validate_uncontrolled_data_used_in_path(path_params):
+        fullpath = os.path.normpath(os.path.join(path_params))
+        if not fullpath.startswith(path_params[0]):
+            raise Exception("Security exception: Uncontrolled data used in path expression")
+        return fullpath
+
     @staticmethod
     def __create_index_html(input_dir, output_dir):
 
         # Copy index.xml and report.xsl to temp - for index.html we don't need to generate anything. Copying is enough.
-        shutil.copy2("data/xml/index.xml", input_dir)
-        shutil.copy2("data/xml/report.xsl", input_dir)
+        #index_xml = validate_uncontrolled_data_used_in_path([output_dir, "data", "xml", "index.xml"])
+        index_xml = os.path.normpath(importlib_resources.files("javacore_analyser") / "data" / "xml" / "index.xml")
+        shutil.copy2(index_xml, input_dir)
+
+        report_xsl = os.path.normpath(importlib_resources.files("javacore_analyser") / "data" / "xml" / "report.xsl")
+        shutil.copy2(report_xsl, input_dir)
 
         xslt_doc = etree.parse(input_dir + "/report.xsl")
         xslt_transformer = etree.XSLT(xslt_doc)
diff --git a/logging_utils.py b/src/javacore_analyser/logging_utils.py
similarity index 100%
rename from logging_utils.py
rename to src/javacore_analyser/logging_utils.py
diff --git a/snapshot_collection.py b/src/javacore_analyser/snapshot_collection.py
similarity index 100%
rename from snapshot_collection.py
rename to src/javacore_analyser/snapshot_collection.py
diff --git a/snapshot_collection_collection.py b/src/javacore_analyser/snapshot_collection_collection.py
similarity index 100%
rename from snapshot_collection_collection.py
rename to src/javacore_analyser/snapshot_collection_collection.py
diff --git a/stack_trace.py b/src/javacore_analyser/stack_trace.py
similarity index 92%
rename from stack_trace.py
rename to src/javacore_analyser/stack_trace.py
index 6796569..b97f3a5 100644
--- a/stack_trace.py
+++ b/src/javacore_analyser/stack_trace.py
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from stack_trace_element import StackTraceElement
-from stack_trace_kind import StackTraceKind
+from javacore_analyser.stack_trace_element import StackTraceElement
+from javacore_analyser.stack_trace_kind import StackTraceKind
 
 
 class StackTrace:
diff --git a/stack_trace_element.py b/src/javacore_analyser/stack_trace_element.py
similarity index 88%
rename from stack_trace_element.py
rename to src/javacore_analyser/stack_trace_element.py
index 78b8587..12bcb3b 100644
--- a/stack_trace_element.py
+++ b/src/javacore_analyser/stack_trace_element.py
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from constants import STACK_TRACE, NATIVE_STACK_TRACE
-from stack_trace_kind import StackTraceKind
+from javacore_analyser.constants import STACK_TRACE, NATIVE_STACK_TRACE
+from javacore_analyser.stack_trace_kind import StackTraceKind
 
 
 class StackTraceElement:
diff --git a/stack_trace_kind.py b/src/javacore_analyser/stack_trace_kind.py
similarity index 100%
rename from stack_trace_kind.py
rename to src/javacore_analyser/stack_trace_kind.py
diff --git a/templates/index.html b/src/javacore_analyser/templates/index.html
similarity index 100%
rename from templates/index.html
rename to src/javacore_analyser/templates/index.html
diff --git a/thread_snapshot.py b/src/javacore_analyser/thread_snapshot.py
similarity index 98%
rename from thread_snapshot.py
rename to src/javacore_analyser/thread_snapshot.py
index 51eb61a..27fcb4e 100644
--- a/thread_snapshot.py
+++ b/src/javacore_analyser/thread_snapshot.py
@@ -7,10 +7,10 @@
 import re
 from datetime import datetime
 
-from constants import *
-from stack_trace import StackTrace
-from stack_trace_element import StackTraceElement
-from stack_trace_kind import StackTraceKind
+from javacore_analyser.constants import *
+from javacore_analyser.stack_trace import StackTrace
+from javacore_analyser.stack_trace_element import StackTraceElement
+from javacore_analyser.stack_trace_kind import StackTraceKind
 
 
 class ThreadSnapshot:
diff --git a/tips.py b/src/javacore_analyser/tips.py
similarity index 100%
rename from tips.py
rename to src/javacore_analyser/tips.py
diff --git a/verbose_gc.py b/src/javacore_analyser/verbose_gc.py
similarity index 100%
rename from verbose_gc.py
rename to src/javacore_analyser/verbose_gc.py
diff --git a/test/test_code_snapshot_collection.py b/test/test_code_snapshot_collection.py
index 037cc8e..a8c68ab 100644
--- a/test/test_code_snapshot_collection.py
+++ b/test/test_code_snapshot_collection.py
@@ -5,9 +5,9 @@
 
 import unittest
 
-from code_snapshot_collection import CodeSnapshotCollection
-from java_thread import Thread
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser.code_snapshot_collection import CodeSnapshotCollection
+from javacore_analyser.java_thread import Thread
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class TestCodeSnapshotCollection(unittest.TestCase):
diff --git a/test/test_gc_collection.py b/test/test_gc_collection.py
index 063ee97..23d54ea 100644
--- a/test/test_gc_collection.py
+++ b/test/test_gc_collection.py
@@ -6,7 +6,7 @@
 import unittest
 from xml.dom.minidom import Element, parseString
 
-from verbose_gc import GcCollection, DURATION
+from javacore_analyser.verbose_gc import GcCollection, DURATION
 
 
 class TestGcCollection(unittest.TestCase):
diff --git a/test/test_java_thread.py b/test/test_java_thread.py
index 1413c78..136a269 100644
--- a/test/test_java_thread.py
+++ b/test/test_java_thread.py
@@ -6,9 +6,9 @@
 import datetime
 import unittest
 
-from java_thread import Thread
-from javacore import Javacore
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser.java_thread import Thread
+from javacore_analyser.javacore import Javacore
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class TestJavaThread(unittest.TestCase):
diff --git a/test/test_javacore.py b/test/test_javacore.py
index 111d42c..7a28eaa 100644
--- a/test/test_javacore.py
+++ b/test/test_javacore.py
@@ -6,9 +6,9 @@
 import os
 import unittest
 
-from javacore import Javacore
-from javacore_set import JavacoreSet
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser.javacore import Javacore
+from javacore_analyser.javacore_set import JavacoreSet
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class TestJavacore(unittest.TestCase):
diff --git a/test/test_javacore_analyzer.py b/test/test_javacore_analyser.py
similarity index 80%
rename from test/test_javacore_analyzer.py
rename to test/test_javacore_analyser.py
index 898d201..276b8ad 100644
--- a/test/test_javacore_analyzer.py
+++ b/test/test_javacore_analyser.py
@@ -11,8 +11,8 @@
 import unittest
 from unittest.mock import patch
 
-import javacore_analyzer
-from javacore import CorruptedJavacoreException
+from javacore_analyser import javacore_analyser_batch
+from javacore_analyser.javacore import CorruptedJavacoreException
 
 
 def rm_tmp_dir():
@@ -20,50 +20,50 @@ def rm_tmp_dir():
         shutil.rmtree("tmp")
 
 
-class TestJavacoreAnalyzer(unittest.TestCase):
+class TestJavacoreAnalyser(unittest.TestCase):
 
     @classmethod
     def setUpClass(self):
-        self.ziptestargs = ["javacore_analyzer", "test/data/archives/javacores.zip", "tmp"]
-        self.gztestargs = ["javacore_analyzer", "test/data/archives/javacores.tar.gz", "tmp"]
-        self.tgztestargs = ["javacore_analyzer", "test/data/archives/javacores.tgz", "tmp"]
-        self.bz2testargs = ["javacore_analyzer", "test/data/archives/javacores.tar.bz2", "tmp"]
-        self.sevenztestargs = ["javacore_analyzer", "test/data/archives/javacores.7z", "tmp"]
-        self.withoutjavacoresargs = ["javacore_analyzer", "test/data/archives/archive_without_javacores.zip", "tmp"]
-        self.javacorefilescorrupted = ["javacore_analyzer", "test/data/archives/javacores-corrupted.zip", "tmp"]
-        self.javacoresstartingaaa = ["javacore_analyzer", "test/data/archives/javacores-starting-aaa.zip", "tmp"]
-        self.javacores_with_invalid_chars = ["javacore_analyzer", "test/data/archives/javacores_with_invalid_chars.zip",
+        self.ziptestargs = ["javacore_analyser", "test/data/archives/javacores.zip", "tmp"]
+        self.gztestargs = ["javacore_analyser", "test/data/archives/javacores.tar.gz", "tmp"]
+        self.tgztestargs = ["javacore_analyser", "test/data/archives/javacores.tgz", "tmp"]
+        self.bz2testargs = ["javacore_analyser", "test/data/archives/javacores.tar.bz2", "tmp"]
+        self.sevenztestargs = ["javacore_analyser", "test/data/archives/javacores.7z", "tmp"]
+        self.withoutjavacoresargs = ["javacore_analyser", "test/data/archives/archive_without_javacores.zip", "tmp"]
+        self.javacorefilescorrupted = ["javacore_analyser", "test/data/archives/javacores-corrupted.zip", "tmp"]
+        self.javacoresstartingaaa = ["javacore_analyser", "test/data/archives/javacores-starting-aaa.zip", "tmp"]
+        self.javacores_with_invalid_chars = ["javacore_analyser", "test/data/archives/javacores_with_invalid_chars.zip",
                                              "tmp"]
-        self.twofilesargs_default_separator = ["javacore_analyzer",
+        self.twofilesargs_default_separator = ["javacore_analyser",
                                                "test/data/javacores/javacore.20220606.114458.32888.0001.txt"
                                                ";test/data/javacores/javacore.20220606.114502.32888.0002.txt", "tmp"]
-        self.twofilesargs_different_separator = ["javacore_analyzer",
+        self.twofilesargs_different_separator = ["javacore_analyser",
                                                  "test/data/javacores/javacore.20220606.114458.32888.0001.txt"
                                                  ":test/data/javacores/javacore.20220606.114502.32888.0002.txt", "tmp",
                                                  "--separator", ":"]
-        self.issue129 = ["javacore_analyzer", "test/data/issue129", "tmp"]
-        self.expateerror = ["javacore_analyzer", "test/data/verboseGcJavacores", "tmp"]
-        self.threadnameswithquotes = ["javacore_analyzer", "test/data/quotationMarks", "tmp"]
+        self.issue129 = ["javacore_analyser", "test/data/issue129", "tmp"]
+        self.expateerror = ["javacore_analyser", "test/data/verboseGcJavacores", "tmp"]
+        self.threadnameswithquotes = ["javacore_analyser", "test/data/quotationMarks", "tmp"]
         rm_tmp_dir()
 
     def test_api(self):
-        javacore_analyzer.process_javacores_and_generate_report_data(["test/data/archives/javacores.zip"], "tmp")
+        javacore_analyser_batch.process_javacores_and_generate_report_data(["test/data/archives/javacores.zip"], "tmp")
         test_failed = False
         try:
-            javacore_analyzer.process_javacores_and_generate_report_data(["test/data/archives/javacores-corrupted.zip"],
+            javacore_analyser_batch.process_javacores_and_generate_report_data(["test/data/archives/javacores-corrupted.zip"],
                                                                          "tmp")
         except CorruptedJavacoreException:
             test_failed = True
         self.assertTrue(test_failed, "API on corrupted file should fail but finished successfully")
-        javacore_analyzer.process_javacores_and_generate_report_data(
+        javacore_analyser_batch.process_javacores_and_generate_report_data(
             ["test/data/javacores/javacore.20220606.114458.32888.0001.txt",
              "test/data/javacores/javacore.20220606.114502.32888.0002.txt"], "tmp")
-        javacore_analyzer.process_javacores_and_generate_report_data(
+        javacore_analyser_batch.process_javacores_and_generate_report_data(
             ["test/data/javacores"], "tmp")
 
         test_failed = False
         try:
-            javacore_analyzer.process_javacores_and_generate_report_data([],"tmp")
+            javacore_analyser_batch.process_javacores_and_generate_report_data([], "tmp")
         except RuntimeError:
             test_failed = True
         self.assertTrue(test_failed, "API on missing javacores should fail but finished successfully")
@@ -116,7 +116,7 @@ def test_error_for_archive_without_javacores(self):
         sys.stdout = captured_output  # and redirect stdout.
         try:
             with patch.object(sys, 'argv', self.withoutjavacoresargs):
-                javacore_analyzer.main()
+                javacore_analyser_batch.main()
         except SystemExit:
             console_output = captured_output.getvalue()
             self.assertRegex(console_output,
@@ -130,7 +130,7 @@ def test_javacores_with_invalid_chars(self):
         sys.stdout = captured_output  # and redirect stdout.
         try:
             with patch.object(sys, 'argv', self.javacores_with_invalid_chars):
-                javacore_analyzer.main()
+                javacore_analyser_batch.main()
         except SystemExit:
             console_output = captured_output.getvalue()
             self.assertRegex(console_output, "CorruptedJavacoreException")
@@ -145,7 +145,7 @@ def test_error_javacore_files_corrupted(self):
         sys.stdout = captured_output  # and redirect stdout.
         try:
             with patch.object(sys, 'argv', self.javacorefilescorrupted):
-                javacore_analyzer.main()
+                javacore_analyser_batch.main()
         except SystemExit:
             console_output = captured_output.getvalue()
             self.assertRegex(console_output, "Error during processing file:")
@@ -155,7 +155,7 @@ def test_error_javacore_files_corrupted(self):
     def runMainWithParams(self, args):
         # From https://stackoverflow.com/questions/18668947/how-do-i-set-sys-argv-so-i-can-unit-test-it
         with patch.object(sys, 'argv', args):
-            javacore_analyzer.main()
+            javacore_analyser_batch.main()
         self.assert_data_generated_and_not_empty()
 
     # Checks whether report.xml and report.xsl have been generated.
diff --git a/test/test_javacore_set.py b/test/test_javacore_set.py
index b4f6cde..42b49cd 100644
--- a/test/test_javacore_set.py
+++ b/test/test_javacore_set.py
@@ -6,8 +6,8 @@
 import os
 import unittest
 
-from constants import UNKNOWN
-from javacore_set import JavacoreSet
+from javacore_analyser.constants import UNKNOWN
+from javacore_analyser.javacore_set import JavacoreSet
 
 
 class TestJavacoreSet(unittest.TestCase):
diff --git a/test/test_stack_trace.py b/test/test_stack_trace.py
index 5d1bb56..12d84b2 100644
--- a/test/test_stack_trace.py
+++ b/test/test_stack_trace.py
@@ -5,9 +5,9 @@
 
 import unittest
 
-from stack_trace import StackTrace
-from stack_trace_element import StackTraceElement
-from stack_trace_kind import StackTraceKind
+from javacore_analyser.stack_trace import StackTrace
+from javacore_analyser.stack_trace_element import StackTraceElement
+from javacore_analyser.stack_trace_kind import StackTraceKind
 
 
 class TestStackTrace(unittest.TestCase):
diff --git a/test/test_stack_trace_element.py b/test/test_stack_trace_element.py
index 7c4ce80..c7d60e1 100644
--- a/test/test_stack_trace_element.py
+++ b/test/test_stack_trace_element.py
@@ -5,8 +5,8 @@
 
 import unittest
 
-from stack_trace_element import StackTraceElement
-from stack_trace_kind import StackTraceKind
+from javacore_analyser.stack_trace_element import StackTraceElement
+from javacore_analyser.stack_trace_kind import StackTraceKind
 
 
 class TestStackTraceElement(unittest.TestCase):
diff --git a/test/test_thread_snapshot.py b/test/test_thread_snapshot.py
index 5ad0323..adc34bd 100644
--- a/test/test_thread_snapshot.py
+++ b/test/test_thread_snapshot.py
@@ -7,11 +7,11 @@
 import unittest
 from xml.dom.minidom import parseString
 
-from java_thread import Thread
-from javacore import Javacore
-from stack_trace import StackTrace
-from stack_trace_element import StackTraceElement
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser.java_thread import Thread
+from javacore_analyser.javacore import Javacore
+from javacore_analyser.stack_trace import StackTrace
+from javacore_analyser.stack_trace_element import StackTraceElement
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class TestThreadSnapshot(unittest.TestCase):
diff --git a/test/test_tips.py b/test/test_tips.py
index 706dc3e..900f873 100644
--- a/test/test_tips.py
+++ b/test/test_tips.py
@@ -9,10 +9,10 @@
 import tempfile
 import unittest
 
-import tips
-from java_thread import Thread
-from javacore_set import JavacoreSet
-from thread_snapshot import ThreadSnapshot
+from javacore_analyser import tips
+from javacore_analyser.java_thread import Thread
+from javacore_analyser.javacore_set import JavacoreSet
+from javacore_analyser.thread_snapshot import ThreadSnapshot
 
 
 class TestTips(unittest.TestCase):
diff --git a/test/test_verbose_gc_parser.py b/test/test_verbose_gc_parser.py
index a29da6f..a9ba6fe 100644
--- a/test/test_verbose_gc_parser.py
+++ b/test/test_verbose_gc_parser.py
@@ -8,7 +8,7 @@
 from datetime import datetime
 from xml.dom.minidom import parseString
 
-from verbose_gc import VerboseGcParser, GC_COLLECTIONS, GC_COLLECTION
+from javacore_analyser.verbose_gc import VerboseGcParser, GC_COLLECTIONS, GC_COLLECTION
 
 
 class TestVerboseGcParser(unittest.TestCase):