Service - Added paging, fixed update
Bundle - Clean up unnecessary files