fixed tests, moved project to webapp style

runtime envionment will be on tomcat in future