Source code update - Cleaning

Moved several methods from PageManager to CategoryManager.

Added some Javadoc.