[WIP] Marge httpd and modules
[WIP] Merge httpd and modules