[tor-commits] [snowflake/master] Restructure a bit based on review