Rename PageDisplayInfo to PageInfo with some changes
Add PageTools
Move the code in CategoryTools.addCategoriesToQuery to Query.addQuery