Refactored page and util namespaces