Moved provider servlet code to own module