Moved webapplication into it's own folder and changed how querying works