Cleaned up Java classes, brought over web.xml