Changed File structure and web.xml accordingly