file re-organise and content page changes