Page Discovery Code Restructure 1