add the basic folders.
Merge origin/master