Refactored lists into separate packages by page