Update and rename web/johnson.xml to pages/johnson.xml