Make webdriver tests works by setting servletpath.
Rearrange test files