B-51783 restructuring directories