Revamped Goal Structure

Goal classes are now by category instead of specific type
Updated Strings

Updated the Strings.xml to match the new goal structure