missed refactor to directory
Merge branch 'vhost_alias' into all_features