Doing a lot of cleaning
Moved script and webservice in this module