Change directory layout in service containers GitOrigin-RevId: 09ff19db2a123cbf7691d51e9ce9be6eee264287