Move modules/apache to modules/webconfig, and modules/puppetlabs-apache to modules/apache.