Major refactor (prior removing Webpage class)