Remove redundant subdirectory level

Change-Id: Iccf02603e0bd28ec494f9300b8faf1ca686130a4