Modify directory hierarchy to support Unified build