Added Combo Class and Test Main

Added Combo Class and Test Main to Subfolder