fix apache config file placement and continue template clenanup