Move the postgresql server states into a subdirectory
Enable pgbouncer on the postgresql client servers