Add some default folder names

Change-Id: I7a1cc58f225708bdc9eeb8354d96a4b834fcb781