fix: cleaned up datasink organization