Reorganise structure