Renamed a few files and moved (almost) all strings to the strings.xml file