diff --git a/README.md b/README.md
index 54d6691..8532d85 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ sudo sh router.sh
 ```
 git clone https://github.com/FluxionNetwork/fluxion.git # Download the latest revision
 cd fluxion # Switch to tool's directory
-./install/install.sh # Install any dependencies
+./install.sh # Install any dependencies
 ```
 
 ## :white_check_mark: Included dependency versions
diff --git a/install/install.sh b/install.sh
similarity index 100%
rename from install/install.sh
rename to install.sh
diff --git a/install/add.py b/install/add.py
deleted file mode 100755
index 745c4b5..0000000
--- a/install/add.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/python
-
-from os import system
-
-commands = [
-    "apt-key adv --keyserver pgp.mit.edu --recv-keys ED444FF07D8D0BF6",
-    "echo '# Kali linux repositories",
-    "deb http://http.kali.org/kali kali-rolling main contrib non-free",
-    "apt-get update -m"
-]
-
-for i in commands:
-    system(i)
diff --git a/install/arch-install.sh b/install/arch-install.sh
deleted file mode 100755
index f9ce5b2..0000000
--- a/install/arch-install.sh
+++ /dev/null
@@ -1,350 +0,0 @@
-#!/bin/bash
-
-########## DEBUG Mode ##########
-##                            ##
-if [ -z ${INSTALLER_DEBUG+x} ]; then INSTALLER_DEBUG=0
-else INSTALLER_DEBUG=1
-fi
-##                            ##
-################################
-
-#Config
-version=2
-revision=6
-#Colors
-red='\e[1;31m'
-blue='\e[1;34m'
-yellow='\e[1;33m'
-transparent="\e[0m"
-
-#DUMP_PATH
-rm -rf /tmp/Installer/
-mkdir /tmp/Installer/
-DUMP_PATH="/tmp/Installer/"
-
-function conditional_clear() {
-
-        if [[ "$INSTALLER_output_device" != "/dev/stdout" ]]; then clear; fi
-}
-
-#Config_END
-if [ $INSTALLER_DEBUG = 1 ]; then
-        ## Developer Mode
-        export INSTALLER_output_device=/dev/stdout
-        HOLD="-hold"
-else
-        ## Normal Mode
-        export INSTALLER_output_device=/dev/null
-        HOLD=""
-fi
-
-#Check root
-if [[ $EUID -ne 0 ]]; then
-        echo -e "\e[1;31mYou don't have admin privilegies, execute the script as root."$transparent
-                                exit
-fi
-
-clear
-
-#Check for X display
-
-if [ -z "${DISPLAY:-}" ]; then
-    echo -e "\e[1;31mThe script should be executed inside a X (graphical) session."$transparent""
-    exit 1
-fi
-
-function mostrarheader(){
-
-        conditional_clear
-        echo -e "$red[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]"
-        echo -e "$red[                                                      ]"
-    echo -e "$red[  $red    FLUXION $version" "${yellow} ${red}  < F""${yellow}luxion" "${red}I""${yellow}s" "${red}T""${yellow}he ""${red}F""${yellow}uture >          "${blue}"]"
-        echo -e "$blue[                                                      ]"
-        echo -e "$blue[~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]""$transparent"
-        echo
-        echo
-
-}
-
-function setresolution {
-
-        function resA {
-
-                TOPLEFT="-geometry 90x13+0+0"
-                TOPRIGHT="-geometry 83x26-0+0"
-                BOTTOMLEFT="-geometry 90x24+0-0"
-                BOTTOMRIGHT="-geometry 75x12-0-0"
-                TOPLEFTBIG="-geometry 91x42+0+0"
-                TOPRIGHTBIG="-geometry 83x26-0+0"
-        }
-
-        function resB {
-
-                TOPLEFT="-geometry 92x14+0+0"
-                TOPRIGHT="-geometry 68x25-0+0"
-                BOTTOMLEFT="-geometry 92x36+0-0"
-                BOTTOMRIGHT="-geometry 74x20-0-0"
-                TOPLEFTBIG="-geometry 100x52+0+0"
-                TOPRIGHTBIG="-geometry 74x30-0+0"
-        }
-        function resC {
-
-                TOPLEFT="-geometry 100x20+0+0"
-                TOPRIGHT="-geometry 109x20-0+0"
-                BOTTOMLEFT="-geometry 100x30+0-0"
-                BOTTOMRIGHT="-geometry 109x20-0-0"
-                TOPLEFTBIG="-geometry  100x52+0+0"
-                TOPRIGHTBIG="-geometry 109x30-0+0"
-        }
-        function resD {
-                TOPLEFT="-geometry 110x35+0+0"
-                TOPRIGHT="-geometry 99x40-0+0"
-                BOTTOMLEFT="-geometry 110x35+0-0"
-                BOTTOMRIGHT="-geometry 99x30-0-0"
-                TOPLEFTBIG="-geometry 110x72+0+0"
-                TOPRIGHTBIG="-geometry 99x40-0+0"
-        }
-        function resE {
-                TOPLEFT="-geometry 130x43+0+0"
-                TOPRIGHT="-geometry 68x25-0+0"
-                BOTTOMLEFT="-geometry 130x40+0-0"
-                BOTTOMRIGHT="-geometry 132x35-0-0"
-                TOPLEFTBIG="-geometry 130x85+0+0"
-                TOPRIGHTBIG="-geometry 132x48-0+0"
-        }
-        function resF {
-                TOPLEFT="-geometry 100x17+0+0"
-                TOPRIGHT="-geometry 90x27-0+0"
-                BOTTOMLEFT="-geometry 100x30+0-0"
-                BOTTOMRIGHT="-geometry 90x20-0-0"
-                TOPLEFTBIG="-geometry  100x70+0+0"
-                TOPRIGHTBIG="-geometry 90x27-0+0"
-}
-
-detectedresolution=$(xdpyinfo | grep -A 3 "screen #0" | grep dimensions | tr -s " " | cut -d" " -f 3)
-##  A) 1024x600
-##  B) 1024x768
-##  C) 1280x768
-##  D) 1280x1024
-##  E) 1600x1200
-case $detectedresolution in
-        "1024x600" ) resA ;;
-        "1024x768" ) resB ;;
-        "1280x768" ) resC ;;
-        "1366x768" ) resC ;;
-        "1280x1024" ) resD ;;
-        "1600x1200" ) resE ;;
-        "1366x768"  ) resF ;;
-                  * ) resA ;;
-esac
-}
-
-#Install Main
-conditional_clear
-mostrarheader
-
-echo "Updating system..."
-sudo pacman -S xterm --noconfirm
-
-
-##############################
-
-echo -ne "Aircrack-ng....."
-        if ! hash aircrack-ng 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent
-         xterm $HOLD -title "Installing Aircrack-ng" -e pacman -S  aircrack-ng
-        else
-    echo -e "\e[1;32mOK!"$transparent
-        fi
-        sleep 0.025
-
-##############################
-
-echo -ne "Aireplay-ng....."
-        if ! hash awk 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                xterm $HOLD -title "Installing Awk" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  gawk
-        else
-                echo -e "\e[1;32mOK!"$transparent
-        fi
-        sleep 0.025
-##############################
-
-echo -ne "Airodump-ng....."
-if ! hash airodump-ng 2>/dev/null; then
-        echo -e "\e[1;31mInstalling ..."$transparent""
-        xterm $HOLD -title "Installing Airodump-ng" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  aircrack-ng
-else
-        echo -e "\e[1;32mOK!"$transparent""
-    fi
-
-##############################
-echo -ne "Curl............"
-        if ! hash curl 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing Curl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  curl
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-##############################
-
-echo -ne "Dhcpd..........."
-        if ! hash dhcpd 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                xterm $HOLD -title "Installing isc-dhcp-server" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S dhcp
-        else
-                echo -e "\e[1;32mOK!"$transparent
-        fi
-        sleep 0.025
-##############################
-
-echo -ne "Hostapd........."
-        if ! hash hostapd 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                xterm $HOLD -title "Installing Hostapd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  hostapd
-        else
-                echo -e "\e[1;32mOK!"$transparent
-        fi
-        sleep 0.025
-##############################
-
-echo -ne "Iwconfig........"
-if ! hash iwconfig 2>/dev/null; then
-                        echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing Iwconfig" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  iwconfig
-else
-        echo -e "\e[1;32mOK!"$transparent""
-fi
-sleep 0.025
-##############################
-        echo -ne "Lighttpd........"
-        if ! hash lighttpd 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing Lighttpd" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  lighttpd
-        else
-                echo -e "\e[1;32mOK!"$transparent
-        fi
-        sleep 0.025
-##############################
-
-echo -ne "Macchanger......"
-        if ! hash macchanger 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  macchanger
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-##############################
-
-echo -ne "Mdk3............"
-        if ! hash mdk3 2>/dev/null; then
-        echo -e "\e[1;31mInstalling ..."$transparent""
-        xterm $HOLD -title "Installing Macchanger" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  mdk3
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-
-##############################
-
-echo -ne "Nmap............"
-        if ! hash nmap 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                xterm $HOLD -title "Installing Nmap" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S nmap
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-##############################
-echo -ne "Openssl........."
-if ! hash openssl 2>/dev/null; then
-        echo -e "\e[1;31mInstalling ..."$transparent""
-        xterm $HOLD -title "Installing Openssl" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  openssl
-else
-        echo -e "\e[1;32mOK!"$transparent""
-fi
-sleep 0.025
-##############################
-echo -ne "Php-cgi........."
-        if ! hash php-cgi 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing php-cgi" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  php-cgi
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-##############################
-
-        echo -ne "Pyrit..........."
-        if ! hash pyrit 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                xterm $HOLD -title "Installing Pyrit" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  pyrit
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-##############################
-
-echo -ne "Python.........."
-        if ! hash python 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing Python" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  python
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-
-##############################
-        echo -ne "Reaver.........."
-        if ! hash reaver 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                xterm $HOLD -title "Installing Reaver" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  reaver
-        else
-                echo -e "\e[1;32mOK!"$transparent""
-        fi
-        sleep 0.025
-##############################
-
-        echo -ne "rfkill.........."
-        if ! hash rfkill 2>/dev/null; then
-              echo -e "\e[1;31mInstalling ..."$transparent""
-              xterm $HOLD -title "Installing Rfkill" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  rfkill
-        else
-                echo -e "\e[1;32mOK!"$transparent""
-        fi
-        sleep 0.025
-
-##############################
-
-echo -ne "Unzip..........."
-        if ! hash unzip 2>/dev/null; then
-                echo -e "\e[1;31mInstalling ..."$transparent""
-                        xterm $HOLD -title "Installing unzip" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  unzip
-        else
-                echo -e "\e[1;32mOK!"$transparent
-  fi
-        sleep 0.025
-##############################
-
-echo -ne "strings........."
-if ! hash strings 2>/dev/null; then
-        echo -e "\e[1;31mInstalling ..."$transparent""
-        xterm $HOLD -title "Installing binutils" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  binutils
-else
-        echo -e "\e[1;32mOK!"$transparent""
-fi
-sleep 0.025
-#############################
-echo -ne "fuser..........."
-if ! hash fuser 2>/dev/null; then
-        echo -e "\e[1;31mInstalling ..."$transparent""
-        xterm $HOLD -title "Installing psmisc" $TOPLEFTBIG -bg "#FFFFFF" -fg "#000000" -e pacman -S  psmisc
-else
-        echo -e "\e[1;32mOK!"$transparent""
-fi
-sleep 0.025
-#############################
-xterm $HOLD -title "Remove repositories"  -e python remove.py
-
diff --git a/install/remove.py b/install/remove.py
deleted file mode 100755
index 8898874..0000000
--- a/install/remove.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/python
-
-from os import remove
-
-infile = "/etc/apt/sources.list"
-outfile = "/etc/apt/sources.list"
-
-delete_list = ["# Kali linux repositories | Added by Katoolin\n",
-               "deb http: // http.kali.org / kali kali - rolling main contrib non - free\n",
-               "deb http://repo.kali.org/kali kali-bleeding-edge main\n"]
-
-fin = open(infile)
-remove("/etc/apt/sources.list")
-fout = open(outfile, "w+")
-for line in fin:
-    for word in delete_list:
-        line = line.replace(word, "")
-    fout.write(line)
-fin.close()
-fout.close()
-
-print("\033[1;31mDONE!  \033[1;m")