Restructuring everything, write some page build code.