reorganise in preparation for dynamic content