Move site building out of master