diff --git a/TODO.md b/TODO.md
index 07cd3e8..ac10678 100644
--- a/TODO.md
+++ b/TODO.md
@@ -121,13 +121,13 @@ Not "/py":
   * `tshark.py` <- process
   * `cowpatty.py` <- process
   * `pyrit.py` <- process
+  * `handshake.py` <- tshark, cowpatty, pyrit, aircrack
 * `output.py` (color/printing) <- config
 * `process.py` <- config
 * `scan.py` (airodump output to target) <- config, target, airodump
 * **target/**
   * `target.py` (ssid, pcap file) <- airodump, tshark
   * `result.py` (PIN/PSK/KEY)
-  * `handshake.py` <- tshark, cowpatty, pyrit, aircrack
 
 ------------------------------------------------------
 
diff --git a/Wifite.py b/Wifite.py
index de3e6e5..4bffa51 100755
--- a/Wifite.py
+++ b/Wifite.py
@@ -1 +1 @@
-python2 -m wifite.wifite $@
+python2.7 -m wifite.wifite $@
diff --git a/wifite/crack.py b/wifite/util/crack.py
similarity index 97%
rename from wifite/crack.py
rename to wifite/util/crack.py
index b1a3393..b0c1d6f 100755
--- a/wifite/crack.py
+++ b/wifite/util/crack.py
@@ -1,10 +1,10 @@
 #!/usr/bin/python2.7
 # -*- coding: utf-8 -*-
 
-from util.process import Process
-from util.color import Color
-from config import Configuration
-from model.result import CrackResult
+from ..util.process import Process
+from ..util.color import Color
+from ..config import Configuration
+from ..model.result import CrackResult
 
 from datetime import datetime
 
diff --git a/wifite/wifite.py b/wifite/wifite.py
index f03dbca..0240f59 100755
--- a/wifite/wifite.py
+++ b/wifite/wifite.py
@@ -3,14 +3,14 @@
 
 from config import Configuration
 from util.scanner import Scanner
+from util.process import Process
 from util.color import Color
+from util.crack import CrackHandshake
 from attack.wep import AttackWEP
 from attack.wpa import AttackWPA
 from attack.wps import AttackWPS
 from model.result import CrackResult
 from model.handshake import Handshake
-from crack import CrackHandshake
-from util.process import Process
 
 from json import loads
 import os