remove unused folders and change some permissions

Change-Id: Ifd33b104eadff0f027ec0e9c5b42c5d8768224b4