fix and remove a directory

Change-Id: If2c16613f195ec015c5d331b6e4c5da57d2dfab3