Reorganize site.yml

Also corrects a bunch of issues in keystone Apache setup

Still getting permissions issues. :(