Moved Result and Option to the proper categorization.