Initial file reference cleanup
Merge site framework updates