Changing architecutre, adding factory, changes servlets