Fixes to your code, renamed and added strings in strings.xml, removed unnecessary files and folders, etc.