diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..4341fe5
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,3 @@
+include README.md
+include LICENSE
+include wordlists/*
\ No newline at end of file
diff --git a/README.md b/README.md
index d8442e2..f261a06 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 ![PHT Image](.images/Windows_CLI-main.png)
 
-- The tools provided are for educational purposes only. The developers are no way responsible for misuse of information and tools provided. All the information and tools are meant to help newbies to learn new concepts.
+- The tools provided are for educational purposes only. The developers are no way responsible for misuse of information and tools provided. All the information and tools are meant to help users to learn concepts. Use tools wisely!
 
 - These tools are written in python3, refer installation to install/download tools and its dependencies.
 
@@ -20,60 +20,55 @@
 
    [![YT Thumbnail](https://img.youtube.com/vi/Wg-PiywAqyw/maxresdefault.jpg)](https://youtu.be/Wg-PiywAqyw)
 
-### Installation
+## Installation
 
-1. Open terminal
+- Open terminal
 
-2. Install git package
+- Install git package
 
    ```bash
    sudo apt install git python3 -y
    ```
 
-3. clone the repository to your machine
+- clone the repository to your machine
 
    ```bash
    git clone https://github.com/dmdhrumilmistry/pyhtools.git
    ```
 
-4. Change directory
+- Change directory
 
    ```bash
    cd pyhtools
    ```
   
-5. install requirements
+- install requirements
 
    ```bash
    python3 -m pip install -r requirements.txt
    ```
 
-### Start PHTools
+## Start PHTools
 
-1. change to pyhtools directory
+- run pyhtools.py
 
    ```bash
-   cd pyhtools
+   python3 -m pyhtools
    ```
 
-2. run pyhtools.py
-
-   ```bash
-   python3 pyhtools.py
-   ```
-
-3. to get all the commands use `help`
+- to get all the commands use `help`
 
    ```bash
    pyhtools >> help
    ```
 
-> There may be chances that pyfiglet or kamene will not be installed through requirements.txt, you can install manually using `pip3 install pyfiglet kamene`.
-> If you're using Termux or windows, then use `pip` instead of `pip3`.
+> There may be chances that pyfiglet or kamene will not be installed through requirements.txt, you can install manually using `pip3 install pyfiglet kamene`.  
+> If you're using Termux or windows, then use `pip` instead of `pip3`.  
+> Few features are only for linux os, hence they might not work on windows and require admin priviliges.
 
-### Tools and Features
+## Tools and Features
 
-#### Attackers
+### Attackers
 
 - `For Networks`
   - Network Scanner
@@ -90,11 +85,11 @@
   - Web crawler (detects dirs | subdomains)
   - Web Vulnerablity Scanner
 
-#### Detectors
+### Detectors
 
 - ARP Spoof Detector
 
-#### Malwares/Trojans/Payloads/Ransomwares/Worms
+### Malwares/Trojans/Payloads/Ransomwares/Worms
 
 - Email Sender (reporter)
 - Downloader
@@ -112,7 +107,7 @@
 
   > **NOTE:** Do not upload/send/report malwares to anti virus services such as `VirusTotal`. This will make program detectable
 
-### Dependencies
+## Dependencies
 
    **`PHT`** requires following programs/scripts to run properly -
 
@@ -130,20 +125,16 @@
 
    > **NOTE:** most of the modules are pre-installed, still to ensure the proper working of scripts, user should install the required modules using pip
 
-### How to Package a Trojan
+## How to Package a Trojan
 
 - [View How to create a Trojan](https://github.com/dmdhrumilmistry/hacking_tools/blob/master/malwares/Trojans/HowToCreateTrojanPackage.md)
 
-### TODO
-
-- [ ] Create package and upload to PyPi
-
-### Have any Ideas 💡 or issue
+## Have any Ideas 💡 or issue
 
 - Create an issue
 - Fork the repo, update script and create a Pull Request
 
-### Connect With Me
+## Connect With Me
 
 ||Platforms||
 |:-:|:-:|:-:|
diff --git a/requirements.txt b/requirements.txt
index cb501f3..9929f28 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,11 @@
-scapy>=2.4.5
-requests>=2.25.1
-argparse>=1.4.0
-#netfilterqueue (for linux devices only): sudo pip3 install --upgrade -U git+https://github.com/kti/python-netfilterqueue
-pynput>=1.7.3
-colorama>=0.4.4
 beautifulsoup4>=4.9.3
-pyfiglet>=0.8.post1
-prettytable>=2.1.0
+colorama>=0.4.4
+#netfilterqueue (for linux devices only): sudo pip3 install --upgrade -U git+https://github.com/kti/python-netfilterqueue
 kamene>=0.32
+scapy>=2.4.5
 psutil>=5.8.0
+prettytable>=2.1.0
+pynput>=1.7.3
+pyfiglet>=0.8.post1
 pytelegrambotapi>=4.0.1
-pyfiglet
\ No newline at end of file
+requests>=2.25.1
\ No newline at end of file
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..b83e5ff
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,44 @@
+from setuptools import setup, find_packages
+from os import path
+
+
+this_directory = path.abspath(path.dirname(__file__))
+with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+
+setup(
+    name='PyHTools',
+    version='1.0.1',
+    author='Dhrumil Mistry',
+    author_email='contact@dmdhrumilmistry.me',
+    license='MIT License',
+    description='Python Hacking Tools (PyHTools) (pht) is a collection of python written hacking tools consisting of network scanner, arp spoofer and detector, dns spoofer, code injector, packet sniffer, network jammer, email sender, downloader, wireless password harvester credential harvester, keylogger, download&execute, and reverse_backdoor along with website login bruteforce, scraper, web spider etc. PHT also includes malwares which are undetectable by the antiviruses.',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    packages=find_packages(),
+    include_package_data=True,
+    install_requires=[
+        'beautifulsoup4',
+        'colorama',
+        # 'netfilterqueue',
+        'kamene',
+        'scapy',
+        'psutil',
+        'prettytable',
+        'pynput',
+        'pyfiglet',
+        'pytelegrambotapi',
+        'requests',
+    ],
+    classifiers=[
+        'Development Status :: 4 - Beta',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9'
+        'Programming Language :: Python :: 3.10',
+    ],
+)
diff --git a/wordlists/README.md b/wordlists/README.md
index 0b4c6e9..26464e8 100644
--- a/wordlists/README.md
+++ b/wordlists/README.md
@@ -2,9 +2,10 @@
 
 Below wordlists are for testing purpose:
 
-- files-and-dirs-wordlist.txt
-- subdomains-wordlist.txt
-- test-wordlist.txt
+- Common
+  - pass.txt (passwords)
+  - web-dirs-files.txt (website directories and files discovery)
+  - web-subdomains.txt (website domain discovery)
 
 ## To Get/Generate Wordlists
 
diff --git a/wordlists/common_pass.txt b/wordlists/common/pass.txt
similarity index 100%
rename from wordlists/common_pass.txt
rename to wordlists/common/pass.txt
diff --git a/wordlists/files-and-dirs-wordlist.txt b/wordlists/common/web-dirs-files.txt
similarity index 100%
rename from wordlists/files-and-dirs-wordlist.txt
rename to wordlists/common/web-dirs-files.txt
diff --git a/wordlists/subdomains-wordlist.txt b/wordlists/common/web-subdomains.txt
similarity index 100%
rename from wordlists/subdomains-wordlist.txt
rename to wordlists/common/web-subdomains.txt
diff --git a/wordlists/test-wordlist.txt b/wordlists/test-wordlist.txt
deleted file mode 100644
index 4499e80..0000000
--- a/wordlists/test-wordlist.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-mail
-docs
-developer
-drive
-test
-beta
\ No newline at end of file