Modify directory structure in preparation for ARQ-1540