renamed package of mocks-servlet and mocks-support