Complete company_spec refactor