First round of org changes

Mostly PHP config stuff