Re-organzing, adding an index, separate pages for different test scenarios.