diff --git a/.gitignore b/.gitignore
index 1620ea6f75..a19955497d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 # Private data
 android-private-data/
 **/PrivateConst.kt
+private-data/
 
 # Release keys
 android-keys/
diff --git a/open_source.sh b/open_source.sh
index df6ae3d577..0e6cd19d50 100755
--- a/open_source.sh
+++ b/open_source.sh
@@ -3,4 +3,4 @@ set -ex
 
 # Open source users: Run this script before building.
 rm private-data
-mv open_source_data private-data
+cp -R open_source_data private-data
diff --git a/open_source_data/foosball/files.list b/open_source_data/foosball/files.list
index 7882a276f8..d7d4516111 100644
--- a/open_source_data/foosball/files.list
+++ b/open_source_data/foosball/files.list
@@ -8,3 +8,24 @@ tablet/google-services.json=app/src/tablet/google-services.json
 # Fabric key
 fabric.properties=app/fabric.properties
 
+# Commentator MP3s
+tablet/raw/bagel_song.mp3=app/src/tablet/res/raw/bagel_song.mp3
+tablet/raw/ding.mp3=app/src/tablet/res/raw/ding.mp3
+tablet/raw/ding_ding.mp3=app/src/tablet/res/raw/ding_ding.mp3
+tablet/raw/ding_reverse.mp3=app/src/tablet/res/raw/ding_reverse.mp3
+tablet/raw/dominating.mp3=app/src/tablet/res/raw/dominating.mp3
+tablet/raw/doublekill.mp3=app/src/tablet/res/raw/doublekill.mp3
+tablet/raw/firstblood.mp3=app/src/tablet/res/raw/firstblood.mp3
+tablet/raw/killingspree.mp3=app/src/tablet/res/raw/killingspree.mp3
+tablet/raw/massacre.mp3=app/src/tablet/res/raw/massacre.mp3
+tablet/raw/multikill.mp3=app/src/tablet/res/raw/multikill.mp3
+tablet/raw/murca.mp3=app/src/tablet/res/raw/murca.mp3
+tablet/raw/rotate_ding.mp3=app/src/tablet/res/raw/rotate_ding.mp3
+tablet/raw/unstoppable.mp3=app/src/tablet/res/raw/unstoppable.mp3
+tablet/raw/motivation.mp3=app/src/tablet/res/raw/motivation.mp3
+tablet/raw/leeroy_jenkins.mp3=app/src/tablet/res/raw/leeroy_jenkins.mp3
+tablet/raw/illuminati_confirmed.mp3=app/src/tablet/res/raw/illuminati_confirmed.mp3
+tablet/raw/mlg_horn.mp3=app/src/tablet/res/raw/mlg_horn.mp3
+tablet/raw/legitness.mp3=app/src/tablet/res/raw/legitness.mp3
+tablet/raw/profamity.mp3=app/src/tablet/res/raw/profamity.mp3
+tablet/raw/police_siren.mp3=app/src/tablet/res/raw/police_siren.mp3
diff --git a/open_source_data/polling/files.list b/open_source_data/polling/files.list
index 851db97364..02464cbe84 100644
--- a/open_source_data/polling/files.list
+++ b/open_source_data/polling/files.list
@@ -2,4 +2,4 @@
 private.properties=private.properties
 
 # Analytics
-global_tracker.xml=app/src/main/res/xml/global_tracker.xml
\ No newline at end of file
+global_tracker.xml=src/main/res/xml/global_tracker.xml
\ No newline at end of file
diff --git a/open_source_data/student/files.list b/open_source_data/student/files.list
index 197f01401c..efe2a5a49f 100644
--- a/open_source_data/student/files.list
+++ b/open_source_data/student/files.list
@@ -2,13 +2,13 @@
 private.properties=private.properties
 
 # Fabric key
-fabric.properties=candroid/fabric.properties
+fabric.properties=fabric.properties
 
 # Google Services
-google-services.json=candroid/google-services.json
+google-services.json=google-services.json
 
 # Google Analytics
-analytics.xml=candroid/src/main/res/xml/analytics.xml
+analytics.xml=src/main/res/xml/analytics.xml
 
 # Polling List & Private Strings
-strings.xml=candroid/src/main/res/values/private_strings.xml
+strings.xml=src/main/res/values/private_strings.xml
diff --git a/open_source_data/student/google-services.json b/open_source_data/student/google-services.json
index 0226891a01..6d83db1c40 100644
--- a/open_source_data/student/google-services.json
+++ b/open_source_data/student/google-services.json
@@ -6,7 +6,7 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "2",
+        "mobilesdk_app_id": "1:111111111111:android:1111111111111111",
         "android_client_info": {
           "package_name": "com.instructure.candroid"
         }
diff --git a/open_source_data/student/private.properties b/open_source_data/student/private.properties
index ef768fcf27..7ff76768bf 100644
--- a/open_source_data/student/private.properties
+++ b/open_source_data/student/private.properties
@@ -4,4 +4,4 @@ pushServiceProjectId=2
 # PSPDFKit
 pspdfMavenUser=pspdfkit
 pspdfMavenPass=jZdwMw7uqYGuKc6RxYLuEPwYqyvYQQ
-pspdfkitLicenseKey=TRIAL-Gkpss4ZmwCOyNtJeyQTcSZVIMoL1jmcb8STL4Y_RNt2nLsKxw3HLhkR9q6UKawrAF2CKzojYBpu3uLmU80HtPA
\ No newline at end of file
+pspdfkitLicenseKey=qX28PZZKCLAV0rGUvC-AwPwt0TjPoHHyg3zpa1DlMpukb94wOo1qRD7FAcOMG1fXUo8w_H-4TrDBXAcRso7EECEPbj_D3P_MOxNKqjO9Yin8dEEmbFErWlbXkn2z74fs0vguihzPit6DpqFI0CnL8NYhpth-9A98h9yrJ3_X3waNH-Bn1OcD-cTKSbLNIAkC_4XjcsPKB94l183-r8PqqEfQJOAhU7A4JxWi1HctDNyMac88CzZ_2HQAVHHI_r-oxsmXp9ytjE5r_Z-sfSBsY5btpRqNqfxz0X1j4RoCvw4El-JvqOPtdOQFiIlcunsxPOhg-JgKf6OssSZ_ZeIFed5zPAjE99q0eaC4AZu_HDAp6WJUJhqQpVisRz89Eqcz1nipzVKko-MoivRuMGs69bxiK8c9nth3SDeNEPhPLb9O68TwWNH1bV8jdpTOwmnSheXkKql3T1pe7qrC-w4wuUZvIdOxqW36WQ85JtLf7Cg0u4YLMV1x_5s4Gocs8lifNRSrYo1rN5V6rIaVljtbCMZomQG7BUoVq14hD1YzpR13MyNMY5bNamZ-xmcM74GPdhE_8pNc980FhtoRvqs3zdTNcfzFyoWyjGDFChHZYGtj40nlJiaRr207GJzvxtl0
diff --git a/open_source_data/teacher/files.list b/open_source_data/teacher/files.list
index 73027b0957..e8d520ad23 100644
--- a/open_source_data/teacher/files.list
+++ b/open_source_data/teacher/files.list
@@ -2,7 +2,7 @@
 private.properties=private.properties
 
 # Fabric
-fabric.properties=app/fabric.properties
+fabric.properties=fabric.properties
 
 # Google Services
-google-services.json=app/google-services.json
\ No newline at end of file
+google-services.json=google-services.json
\ No newline at end of file
diff --git a/open_source_data/teacher/google-services.json b/open_source_data/teacher/google-services.json
index 61b48f5a14..737404361c 100644
--- a/open_source_data/teacher/google-services.json
+++ b/open_source_data/teacher/google-services.json
@@ -6,7 +6,7 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "2",
+        "mobilesdk_app_id": "1:111111111111:android:1111111111111111",
         "android_client_info": {
           "package_name": "com.instructure.teacher"
         }
diff --git a/open_source_data/teacher/private.properties b/open_source_data/teacher/private.properties
index f482af5714..7419d40ea0 100644
--- a/open_source_data/teacher/private.properties
+++ b/open_source_data/teacher/private.properties
@@ -9,6 +9,6 @@ roboUser=1
 
 # PSPDFKit
 pspdfMavenUser=pspdfkit
-pspdfMavenPass=TRIAL-Gkpss4ZmwCOyNtJeyQTcSZVIMoL1jmcb8STL4Y_RNt2nLsKxw3HLhkR9q6UKawrAF2CKzojYBpu3uLmU80HtPA
-pspdfkitLicenseKey=TRIAL-Gkpss4ZmwCOyNtJeyQTcSZVIMoL1jmcb8STL4Y_RNt2nLsKxw3HLhkR9q6UKawrAF2CKzojYBpu3uLmU80HtPA
-pushServiceProjectId=1
\ No newline at end of file
+pspdfMavenPass=jZdwMw7uqYGuKc6RxYLuEPwYqyvYQQ
+pspdfkitLicenseKey=qX28PZZKCLAV0rGUvC-AwPwt0TjPoHHyg3zpa1DlMpukb94wOo1qRD7FAcOMG1fXUo8w_H-4TrDBXAcRso7EECEPbj_D3P_MOxNKqjO9Yin8dEEmbFErWlbXkn2z74fs0vguihzPit6DpqFI0CnL8NYhpth-9A98h9yrJ3_X3waNH-Bn1OcD-cTKSbLNIAkC_4XjcsPKB94l183-r8PqqEfQJOAhU7A4JxWi1HctDNyMac88CzZ_2HQAVHHI_r-oxsmXp9ytjE5r_Z-sfSBsY5btpRqNqfxz0X1j4RoCvw4El-JvqOPtdOQFiIlcunsxPOhg-JgKf6OssSZ_ZeIFed5zPAjE99q0eaC4AZu_HDAp6WJUJhqQpVisRz89Eqcz1nipzVKko-MoivRuMGs69bxiK8c9nth3SDeNEPhPLb9O68TwWNH1bV8jdpTOwmnSheXkKql3T1pe7qrC-w4wuUZvIdOxqW36WQ85JtLf7Cg0u4YLMV1x_5s4Gocs8lifNRSrYo1rN5V6rIaVljtbCMZomQG7BUoVq14hD1YzpR13MyNMY5bNamZ-xmcM74GPdhE_8pNc980FhtoRvqs3zdTNcfzFyoWyjGDFChHZYGtj40nlJiaRr207GJzvxtl0
+pushServiceProjectId=1