Housekeeping - moving the folder structure to work with the auto-pagegen format