organize Page Entity code