Refactor mail bundle, added haproxy, nginx