More refactoring.
Re-enabled devsite generation.