Organize the dir of umbrella