initial sync restructuring