last changes on pages + reorganize folders