Further file cleanup, setup pages config