Moved and updated postgres units to clean up