directory structure changed

Change-Id: Ie843f3cc9e99c0e21cd3ec68f43cedb65382a9b5