Update token key

.travis.yml

@@ -33,4 +33,4 @@ cache:
   - "$HOME/.m2"
 env:
   global:
-    secure: mqj5JUiLaTG3OYgLrSYUPTyOOLHgjc0lNYKuNsSy4WXSlZAwOASS8ob3zUBohJ/YoliEacq0X4kZwSRjqkq6kxlgBJx1X74hI5VwbSF+jMzXN67FYH/OCQE2SlFK7Mop52s55uyoxE1NHgBHMwb7DP2gxDJgKjBpVK/h9i5+PCe1HoHFIlK+W1XTBwuFUIyZ++0Oa68ZDC0UcYAO/xLyqtYqzQSPd40CooSMonwOXUU+6z0VXq3VHmlfmY5hvnJT0tcR7xt3SvgvW7ugJHSwgqvc09cXrisNC6ZW7HVBktGKgTabOoqP/eEk5tKxR8fTv7q5kfVMmuujw06cb3ruM2QGkFaKzRYByIYi7H9TIlDtOUSNtoeBe0spWShdFIBJAkxZt0ieyoKGkyUAuIdT7ifTaGbEGGT1H9EEUJa0Z1PJpDFB0EpzEVb7mDygq6l30ePkBs1A12+6IAwvybiItp1WVDvI/u2L8shDFnIdch1hYCsQbnEjtTKO2UptHJPzmi6U42RGx0XenhjSGBTeajvHFSG7gq4Q6WcUuHcx1vcYZu10BN4J8kuoG7AQLqlv2LL8XzLVdUN/6G4IJtXp0Gck6CkghoQJlmABlPSjGSjaT3txnXaojXY6ljO7sOhHtDxTj5tWDtYRleoVvrlQr42jTKIzksXG2JrmjfzNmc8=
+    secure: kYLl7+pKOrpbuePCH83bxgCgXdEzIOyS3JcYfqM5H9JeOGpFC/7zfQvkGZwFw94hf42kU6m0KvoQqKDvy0XhOEPx8LCZeWhPOl9G8WWsiwHaAXEJ6uY6Y6vS2HpjFEsxH6Gn3H2q4Hb6WPgTa0vq3+PPXXhWONz8ohNSp4SS0NK+mzJYFIToVIdo/LQjaeD+M3HcWq4duHPveujIlYjsAGF8c6IoSvC2xcL7F1ZQTL2Nb+CUkw6rKl2j4KnZ3KcWLz5TPFhRD22S+Si+JXxq6CGxh1Xz94e8hEVD4zZbVU9WX2qWCxTxJt31JHfF0UKO9W1Wy6Wre3SPmovGqbNuq0nEWepfA+zY4WmfyiMULoIwteeYKyobph4feWz3QcZJ05aRWhTnguPEsj2yFGDqwuqsuZ5PMdL8+3ODif/+VWQ4Rm39guHeYLtOVXyTiMDcrVSPTWZqubnZ1RwQEp8tplZaPDV3a2dMUfKeUhChF2M0MONCHb3pz51XqJsyY/xqugqLor3lnCJ1abMDvC9/6gbwW5sEmciiTeqb0OXLrTbjb6B+mn73FQWZwxkv9FFM/rjlBEgmTauNS6OObywT7hA87fAXwzh/KU/TyIms3K70YEwnDPVYJZK/03IvMJOoZM8yK2SMHLBMxDQNIgkhQhNmvahp0NmgcTr26WNtbQI=

app/build.gradle

@@ -69,10 +69,24 @@ android {
         }
     }
 
+    def srcDirs = [
+            'application',
+            'login',
+            'preferences'
+    ]
+
     sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-        test.java.srcDirs += 'src/test/kotlin'
-        androidTest.java.srcDirs += 'src/androidTest/kotlin'
+        main {
+            def namespace = 'ca/mcgill/science/ctf/android'
+
+            manifest.srcFile "kotlin/$namespace/AndroidManifest.xml"
+            java.srcDir 'kotlin'
+            java.includes = srcDirs.collect { namespace + it + "/**/*.kt" }
+            res.srcDirs = ["kotlin/$namespace/res"]
+            srcDirs.forEach {
+                res.srcDirs += "kotlin/$namespace/$it/res"
+            }
+        }
     }
 
     packagingOptions {

app/src/main/AndroidManifest.xml → app/kotlin/ca/mcgill/science/ctf/android/AndroidManifest.xml

@@ -4,15 +4,15 @@
     package="ca.mcgill.science.ctf.android">
 
     <application
-        android:name=".CTFApp"
+        android:name=".application.CTFApp"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/CtfTheme"
         tools:ignore="GoogleAppIndexingWarning">
         <activity
-            android:name=".MainActivity"
+            android:name=".application.MainActivity"
             android:label="@string/app_name"
             android:theme="@style/CtfTheme.NoActionBar">
             <intent-filter>

app/src/main/kotlin/ca/mcgill/science/ctf/android/CTFApp.kt → app/kotlin/ca/mcgill/science/ctf/android/application/CTFApp.kt

@@ -1,4 +1,4 @@
-package ca.mcgill.science.ctf.android
+package ca.mcgill.science.ctf.android.application
 
 import android.app.Application
 import ca.mcgill.science.ctf.android.preferences.Prefs

app/src/main/kotlin/ca/mcgill/science/ctf/android/MainActivity.kt → app/kotlin/ca/mcgill/science/ctf/android/application/MainActivity.kt

@@ -1,4 +1,4 @@
-package ca.mcgill.science.ctf.android
+package ca.mcgill.science.ctf.android.application
 
 import androidx.appcompat.app.AppCompatActivity
 

app/src/main/kotlin/ca/mcgill/science/ctf/android/activities/LoginActivity.kt → app/kotlin/ca/mcgill/science/ctf/android/login/LoginActivity.kt

@@ -1,4 +1,4 @@
-package ca.mcgill.science.ctf.android.activities
+package ca.mcgill.science.ctf.android.login
 
 import androidx.appcompat.app.AppCompatActivity