Google has added a newish feature to the Keyword Planner tool to organize keywords into ad groups. The reason I say newish is because Search Engine Land explained it was in beta but now it is available to everyone.