Put build gitfiles into site for simpler development workflow.
Resolving conflicts.