More changes made. Should build & deploy with run jetty run now

Take a look and let me know if you need further help