Moved servlets to web package
Added caching