Acknowledge puppetlabs-postgresql
Fix dependencies
Re-organize