adding pag-server and rearrange default.pp structure