Moving files around and adding in Gradle
Reformatting some code for improved readablity
Moving strings to the String file for localisation