reorganized and renamed pages