Revert "Revert "Refactoring""

This reverts commit d6af8e560f.

app/build.gradle

@@ -59,6 +59,7 @@ android {
             play {
                 java.srcDirs = ['src/main/java', 'src/iab/java']
             }
+            main.res.srcDirs += 'src/main/resExtra'
         }
     }