Clean up class namings. Remove WebPage class