Riviera Estates residents moving back in