Added metasploit service and removed uneeded code and organzied the code...

... is well