Refactor apache

Refactored to use git as source.