Folder rename

Change-Id: I20eec7edc701d2d2234bbe2f2e01ebccb5be4d9c