First half of logic reorganization