Minor restructure of Docker PEP