Rearrange directory layout.
Fix up after rearranging directory layout