Rearrange directory arch

Is this architecture OK?