re-organized website definitions in website class