Folder adjustments

Change-Id: I18a0491087ac8bc623fb2a20b85a39f2b424103f