Update core submodule and refactor json/xml and default page controller to match