further folder cleanup, started custom pages