fixed issues with web.xml not giving back json.
removed conflict with glassfish (awful app server)
moved files into correct webapp directory.