Cleaned up some silliness in page class and renamed file to match class type