Moving files around for cleaner separation
Interim commit covering pagination