Re-arranged classes to bring closer to the Page Object Framework