Organize and clean out strings.xml

In preparation for I18n