move paginators into own namespace and refactor