reorganise structure of folder