!htc,htp Clean up http package structure, closes #15689