Move EntityPerPage-related classes into namespaces

Change-Id: Idd5096880f6c3ceab2cdb7b7edc734bf00689f4b
Merge "Move EntityPerPage-related classes into namespaces"