diff --git a/app/lint.xml b/app/lint.xml
index d3783df47..e93e67d8e 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -15,6 +15,7 @@
         <ignore path="src/main/res/drawable/category_**.png" />
         <ignore path="src/main/res/values/dimens.xml"/>
         <ignore path="src/main/res/values/styles.xml"/>
+        <ignore path="src/full/res/values/styles.xml"/>
         <!-- keep a single strings.xml for all build flavors -->
         <ignore path="src/main/res/values**/strings.xml"/>
     </issue>
diff --git a/app/src/main/res/drawable-hdpi/nfc_touch.png b/app/src/full/res/drawable-hdpi/nfc_touch.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nfc_touch.png
rename to app/src/full/res/drawable-hdpi/nfc_touch.png
diff --git a/app/src/main/res/drawable-hdpi/swap_start_header.png b/app/src/full/res/drawable-hdpi/swap_start_header.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/swap_start_header.png
rename to app/src/full/res/drawable-hdpi/swap_start_header.png
diff --git a/app/src/main/res/drawable-hdpi/wifi.png b/app/src/full/res/drawable-hdpi/wifi.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/wifi.png
rename to app/src/full/res/drawable-hdpi/wifi.png
diff --git a/app/src/main/res/drawable-ldpi/nfc_touch.png b/app/src/full/res/drawable-ldpi/nfc_touch.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/nfc_touch.png
rename to app/src/full/res/drawable-ldpi/nfc_touch.png
diff --git a/app/src/main/res/drawable-ldpi/swap_start_header.png b/app/src/full/res/drawable-ldpi/swap_start_header.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/swap_start_header.png
rename to app/src/full/res/drawable-ldpi/swap_start_header.png
diff --git a/app/src/main/res/drawable-ldpi/wifi.png b/app/src/full/res/drawable-ldpi/wifi.png
similarity index 100%
rename from app/src/main/res/drawable-ldpi/wifi.png
rename to app/src/full/res/drawable-ldpi/wifi.png
diff --git a/app/src/main/res/drawable-mdpi/nfc_touch.png b/app/src/full/res/drawable-mdpi/nfc_touch.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nfc_touch.png
rename to app/src/full/res/drawable-mdpi/nfc_touch.png
diff --git a/app/src/main/res/drawable-mdpi/swap_start_header.png b/app/src/full/res/drawable-mdpi/swap_start_header.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/swap_start_header.png
rename to app/src/full/res/drawable-mdpi/swap_start_header.png
diff --git a/app/src/main/res/drawable-mdpi/wifi.png b/app/src/full/res/drawable-mdpi/wifi.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/wifi.png
rename to app/src/full/res/drawable-mdpi/wifi.png
diff --git a/app/src/main/res/drawable-xhdpi/nfc_touch.png b/app/src/full/res/drawable-xhdpi/nfc_touch.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nfc_touch.png
rename to app/src/full/res/drawable-xhdpi/nfc_touch.png
diff --git a/app/src/main/res/drawable-xhdpi/swap_start_header.png b/app/src/full/res/drawable-xhdpi/swap_start_header.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/swap_start_header.png
rename to app/src/full/res/drawable-xhdpi/swap_start_header.png
diff --git a/app/src/main/res/drawable-xhdpi/wifi.png b/app/src/full/res/drawable-xhdpi/wifi.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/wifi.png
rename to app/src/full/res/drawable-xhdpi/wifi.png
diff --git a/app/src/main/res/drawable-xxhdpi/swap_start_header.png b/app/src/full/res/drawable-xxhdpi/swap_start_header.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/swap_start_header.png
rename to app/src/full/res/drawable-xxhdpi/swap_start_header.png
diff --git a/app/src/main/res/drawable-xxxhdpi/swap_start_header.png b/app/src/full/res/drawable-xxxhdpi/swap_start_header.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/swap_start_header.png
rename to app/src/full/res/drawable-xxxhdpi/swap_start_header.png
diff --git a/app/src/main/res/layout-sw480dp/start_swap_header.xml b/app/src/full/res/layout-sw480dp/start_swap_header.xml
similarity index 100%
rename from app/src/main/res/layout-sw480dp/start_swap_header.xml
rename to app/src/full/res/layout-sw480dp/start_swap_header.xml
diff --git a/app/src/main/res/layout/start_swap_header.xml b/app/src/full/res/layout/start_swap_header.xml
similarity index 100%
rename from app/src/main/res/layout/start_swap_header.xml
rename to app/src/full/res/layout/start_swap_header.xml