Moving section to puppet-builder