Moved everything to WAR/ for easier deployment to appengine