Resharding

@aaijazi @enisoc