Remove hard-coded apache module
Add apache as submodule