Merge "build: consolidate directory creation rules" into integration