Moved import servlet to rest package
More refactoring of repos