Rename Catcher to Catcher/Catcher