From b79815430580e1cce19a94528057961862254636 Mon Sep 17 00:00:00 2001 From: toby cabot Date: Mon, 16 Nov 2015 14:10:32 -0500 Subject: [PATCH] Move AffdexMe files up to root This should make it easier to check out the project in Android Studio and have it be able to build. Having the project files in the AffdexMe subdirectory seems to confuse Studio. --- .gitignore | 5 +++++ {AffdexMe/.idea => .idea}/.name | 0 {AffdexMe/.idea => .idea}/compiler.xml | 0 .../.idea => .idea}/copyright/profiles_settings.xml | 0 {AffdexMe/.idea => .idea}/gradle.xml | 0 {AffdexMe/.idea => .idea}/misc.xml | 0 {AffdexMe/.idea => .idea}/modules.xml | 0 {AffdexMe/.idea => .idea}/vcs.xml | 0 AffdexMe/AffdexMe.iml => AffdexMe.iml | 0 .../AffdexMe_original.iml => AffdexMe_original.iml | 0 {AffdexMe/app => app}/.gitignore | 0 {AffdexMe/app => app}/app.iml | 0 {AffdexMe/app => app}/build.gradle | 0 {AffdexMe/app => app}/build.xml | 0 {AffdexMe/app => app}/proguard-rules.pro | 0 {AffdexMe/app => app}/src/main/AndroidManifest.xml | 0 .../app => app}/src/main/assets/fonts/Square.ttf | Bin .../java/com/affectiva/affdexme/DrawingView.java | 0 .../java/com/affectiva/affdexme/MainActivity.java | 0 .../java/com/affectiva/affdexme/MetricDisplay.java | 0 .../affectiva/affdexme/MetricSelectionFragment.java | 0 .../java/com/affectiva/affdexme/MetricSelector.java | 0 .../java/com/affectiva/affdexme/MetricsManager.java | 0 .../com/affectiva/affdexme/PreferencesUtils.java | 0 .../com/affectiva/affdexme/SettingsActivity.java | 0 .../affectiva/errorreporting/CustomApplication.java | 0 .../com/affectiva/errorreporting/ErrorReporter.java | 0 .../affectiva_logo_clear_background.png | Bin .../res/drawable-hdpi/ic_arrow_back_white_24dp.png | Bin .../src/main/res/drawable-hdpi/settings_button.png | Bin .../res/drawable-hdpi/settings_button_pressed.png | Bin .../main/res/drawable-hdpi/switch_camera_button.png | Bin .../drawable-hdpi/switch_camera_button_pressed.png | Bin .../affectiva_logo_clear_background.png | Bin .../res/drawable-mdpi/ic_arrow_back_white_24dp.png | Bin .../src/main/res/drawable-mdpi/settings_button.png | Bin .../res/drawable-mdpi/settings_button_pressed.png | Bin .../main/res/drawable-mdpi/switch_camera_button.png | Bin .../drawable-mdpi/switch_camera_button_pressed.png | Bin .../src/main/res/drawable-nodpi/anger.jpg | Bin .../src/main/res/drawable-nodpi/attention.jpg | Bin .../src/main/res/drawable-nodpi/brow_furrow.jpg | Bin .../src/main/res/drawable-nodpi/brow_raise.jpg | Bin .../src/main/res/drawable-nodpi/chin_raise.jpg | Bin .../src/main/res/drawable-nodpi/contempt.jpg | Bin .../src/main/res/drawable-nodpi/disgust.jpg | Bin .../src/main/res/drawable-nodpi/engagement.jpg | Bin .../src/main/res/drawable-nodpi/eye_closure.jpg | Bin .../src/main/res/drawable-nodpi/fear.jpg | Bin .../main/res/drawable-nodpi/inner_brow_raise.jpg | Bin .../app => app}/src/main/res/drawable-nodpi/joy.jpg | Bin .../res/drawable-nodpi/lip_corner_depressor.jpg | Bin .../src/main/res/drawable-nodpi/lip_press.jpg | Bin .../src/main/res/drawable-nodpi/lip_pucker.jpg | Bin .../src/main/res/drawable-nodpi/lip_suck.jpg | Bin .../src/main/res/drawable-nodpi/mouth_open.jpg | Bin .../main/res/drawable-nodpi/negative_valence.jpg | Bin .../src/main/res/drawable-nodpi/nose_wrinkle.jpg | Bin .../src/main/res/drawable-nodpi/sadness.jpg | Bin .../src/main/res/drawable-nodpi/smile.jpg | Bin .../src/main/res/drawable-nodpi/smirk.jpg | Bin .../src/main/res/drawable-nodpi/surprise.jpg | Bin .../src/main/res/drawable-nodpi/upper_lip_raise.jpg | Bin .../src/main/res/drawable-nodpi/valence.jpg | Bin .../affectiva_logo_clear_background.png | Bin .../res/drawable-xhdpi/ic_arrow_back_white_24dp.png | Bin .../src/main/res/drawable-xhdpi/settings_button.png | Bin .../res/drawable-xhdpi/settings_button_pressed.png | Bin .../res/drawable-xhdpi/switch_camera_button.png | Bin .../drawable-xhdpi/switch_camera_button_pressed.png | Bin .../affectiva_logo_clear_background.png | Bin .../drawable-xxhdpi/ic_arrow_back_white_24dp.png | Bin .../main/res/drawable-xxhdpi/settings_button.png | Bin .../res/drawable-xxhdpi/settings_button_pressed.png | Bin .../res/drawable-xxhdpi/switch_camera_button.png | Bin .../switch_camera_button_pressed.png | Bin .../drawable/affectiva_logo_clear_background.png | Bin .../main/res/drawable/camera_button_selector.xml | 0 .../main/res/drawable/ic_arrow_back_white_24dp.png | Bin .../src/main/res/drawable/settings_button.png | Bin .../main/res/drawable/settings_button_pressed.png | Bin .../main/res/drawable/settings_button_selector.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/layout/error_reporter.xml | 0 .../app => app}/src/main/res/layout/grid_header.xml | 0 .../app => app}/src/main/res/layout/grid_item.xml | 0 .../src/main/res/layout/metric_chooser.xml | 0 .../src/main/res/layout/metric_layout.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin {AffdexMe/app => app}/src/main/res/raw/anger.mp4 | Bin .../app => app}/src/main/res/raw/attention.mp4 | Bin .../app => app}/src/main/res/raw/brow_furrow.mp4 | Bin .../app => app}/src/main/res/raw/brow_raise.mp4 | Bin .../app => app}/src/main/res/raw/chin_raise.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/contempt.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/disgust.mp4 | Bin .../app => app}/src/main/res/raw/engagement.mp4 | Bin .../app => app}/src/main/res/raw/eye_closure.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/fear.mp4 | Bin .../src/main/res/raw/inner_brow_raise.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/joy.mp4 | Bin .../src/main/res/raw/lip_corner_depressor.mp4 | Bin .../app => app}/src/main/res/raw/lip_press.mp4 | Bin .../app => app}/src/main/res/raw/lip_pucker.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/lip_suck.mp4 | Bin .../app => app}/src/main/res/raw/mouth_open.mp4 | Bin .../app => app}/src/main/res/raw/nose_wrinkle.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/sadness.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/smile.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/smirk.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/surprise.mp4 | Bin .../src/main/res/raw/upper_lip_raise.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/valence.mp4 | Bin {AffdexMe/app => app}/src/main/res/raw/valence0.mp4 | Bin .../src/main/res/values-large/dimens.xml | 0 .../src/main/res/values-normal/dimens.xml | 0 .../src/main/res/values-small/dimens.xml | 0 .../src/main/res/values-xlarge/dimens.xml | 0 {AffdexMe/app => app}/src/main/res/values/attrs.xml | 0 .../app => app}/src/main/res/values/colors.xml | 0 .../app => app}/src/main/res/values/dimens.xml | 0 .../src/main/res/values/metricStyleName.xml | 0 .../src/main/res/values/metricStylePct.xml | 0 .../src/main/res/values/optionsStyle.xml | 0 .../app => app}/src/main/res/values/strings.xml | 0 .../app => app}/src/main/res/values/styles.xml | 0 .../src/main/res/xml/preference_headers.xml | 0 .../src/main/res/xml/settings_preferences.xml | 0 AffdexMe/build.gradle => build.gradle | 0 AffdexMe/gradle.properties => gradle.properties | 0 .../gradle => gradle}/wrapper/gradle-wrapper.jar | Bin .../wrapper/gradle-wrapper.properties | 0 AffdexMe/gradlew => gradlew | 0 AffdexMe/gradlew.bat => gradlew.bat | 0 AffdexMe/settings.gradle => settings.gradle | 0 138 files changed, 5 insertions(+) rename {AffdexMe/.idea => .idea}/.name (100%) rename {AffdexMe/.idea => .idea}/compiler.xml (100%) rename {AffdexMe/.idea => .idea}/copyright/profiles_settings.xml (100%) rename {AffdexMe/.idea => .idea}/gradle.xml (100%) rename {AffdexMe/.idea => .idea}/misc.xml (100%) rename {AffdexMe/.idea => .idea}/modules.xml (100%) rename {AffdexMe/.idea => .idea}/vcs.xml (100%) rename AffdexMe/AffdexMe.iml => AffdexMe.iml (100%) rename AffdexMe/AffdexMe_original.iml => AffdexMe_original.iml (100%) rename {AffdexMe/app => app}/.gitignore (100%) rename {AffdexMe/app => app}/app.iml (100%) rename {AffdexMe/app => app}/build.gradle (100%) rename {AffdexMe/app => app}/build.xml (100%) rename {AffdexMe/app => app}/proguard-rules.pro (100%) rename {AffdexMe/app => app}/src/main/AndroidManifest.xml (100%) rename {AffdexMe/app => app}/src/main/assets/fonts/Square.ttf (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/DrawingView.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/MainActivity.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/MetricDisplay.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/MetricSelector.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/MetricsManager.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/PreferencesUtils.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/affdexme/SettingsActivity.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/errorreporting/CustomApplication.java (100%) rename {AffdexMe/app => app}/src/main/java/com/affectiva/errorreporting/ErrorReporter.java (100%) rename {AffdexMe/app => app}/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-hdpi/settings_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-hdpi/settings_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-hdpi/switch_camera_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-hdpi/switch_camera_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-mdpi/settings_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-mdpi/settings_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-mdpi/switch_camera_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-mdpi/switch_camera_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/anger.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/attention.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/brow_furrow.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/brow_raise.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/chin_raise.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/contempt.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/disgust.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/engagement.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/eye_closure.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/fear.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/inner_brow_raise.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/joy.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/lip_corner_depressor.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/lip_press.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/lip_pucker.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/lip_suck.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/mouth_open.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/negative_valence.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/nose_wrinkle.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/sadness.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/smile.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/smirk.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/surprise.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/upper_lip_raise.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-nodpi/valence.jpg (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xhdpi/settings_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xhdpi/settings_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xhdpi/switch_camera_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xxhdpi/settings_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xxhdpi/settings_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xxhdpi/switch_camera_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable/affectiva_logo_clear_background.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable/camera_button_selector.xml (100%) rename {AffdexMe/app => app}/src/main/res/drawable/ic_arrow_back_white_24dp.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable/settings_button.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable/settings_button_pressed.png (100%) rename {AffdexMe/app => app}/src/main/res/drawable/settings_button_selector.xml (100%) rename {AffdexMe/app => app}/src/main/res/layout/activity_main.xml (100%) rename {AffdexMe/app => app}/src/main/res/layout/error_reporter.xml (100%) rename {AffdexMe/app => app}/src/main/res/layout/grid_header.xml (100%) rename {AffdexMe/app => app}/src/main/res/layout/grid_item.xml (100%) rename {AffdexMe/app => app}/src/main/res/layout/metric_chooser.xml (100%) rename {AffdexMe/app => app}/src/main/res/layout/metric_layout.xml (100%) rename {AffdexMe/app => app}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {AffdexMe/app => app}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {AffdexMe/app => app}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {AffdexMe/app => app}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {AffdexMe/app => app}/src/main/res/raw/anger.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/attention.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/brow_furrow.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/brow_raise.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/chin_raise.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/contempt.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/disgust.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/engagement.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/eye_closure.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/fear.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/inner_brow_raise.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/joy.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/lip_corner_depressor.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/lip_press.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/lip_pucker.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/lip_suck.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/mouth_open.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/nose_wrinkle.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/sadness.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/smile.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/smirk.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/surprise.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/upper_lip_raise.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/valence.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/raw/valence0.mp4 (100%) rename {AffdexMe/app => app}/src/main/res/values-large/dimens.xml (100%) rename {AffdexMe/app => app}/src/main/res/values-normal/dimens.xml (100%) rename {AffdexMe/app => app}/src/main/res/values-small/dimens.xml (100%) rename {AffdexMe/app => app}/src/main/res/values-xlarge/dimens.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/attrs.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/colors.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/dimens.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/metricStyleName.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/metricStylePct.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/optionsStyle.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/strings.xml (100%) rename {AffdexMe/app => app}/src/main/res/values/styles.xml (100%) rename {AffdexMe/app => app}/src/main/res/xml/preference_headers.xml (100%) rename {AffdexMe/app => app}/src/main/res/xml/settings_preferences.xml (100%) rename AffdexMe/build.gradle => build.gradle (100%) rename AffdexMe/gradle.properties => gradle.properties (100%) rename {AffdexMe/gradle => gradle}/wrapper/gradle-wrapper.jar (100%) rename {AffdexMe/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename AffdexMe/gradlew => gradlew (100%) rename AffdexMe/gradlew.bat => gradlew.bat (100%) rename AffdexMe/settings.gradle => settings.gradle (100%) diff --git a/.gitignore b/.gitignore index ccf2efe..8bbf833 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,8 @@ proguard/ # Log Files *.log + +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/captures diff --git a/AffdexMe/.idea/.name b/.idea/.name similarity index 100% rename from AffdexMe/.idea/.name rename to .idea/.name diff --git a/AffdexMe/.idea/compiler.xml b/.idea/compiler.xml similarity index 100% rename from AffdexMe/.idea/compiler.xml rename to .idea/compiler.xml diff --git a/AffdexMe/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml similarity index 100% rename from AffdexMe/.idea/copyright/profiles_settings.xml rename to .idea/copyright/profiles_settings.xml diff --git a/AffdexMe/.idea/gradle.xml b/.idea/gradle.xml similarity index 100% rename from AffdexMe/.idea/gradle.xml rename to .idea/gradle.xml diff --git a/AffdexMe/.idea/misc.xml b/.idea/misc.xml similarity index 100% rename from AffdexMe/.idea/misc.xml rename to .idea/misc.xml diff --git a/AffdexMe/.idea/modules.xml b/.idea/modules.xml similarity index 100% rename from AffdexMe/.idea/modules.xml rename to .idea/modules.xml diff --git a/AffdexMe/.idea/vcs.xml b/.idea/vcs.xml similarity index 100% rename from AffdexMe/.idea/vcs.xml rename to .idea/vcs.xml diff --git a/AffdexMe/AffdexMe.iml b/AffdexMe.iml similarity index 100% rename from AffdexMe/AffdexMe.iml rename to AffdexMe.iml diff --git a/AffdexMe/AffdexMe_original.iml b/AffdexMe_original.iml similarity index 100% rename from AffdexMe/AffdexMe_original.iml rename to AffdexMe_original.iml diff --git a/AffdexMe/app/.gitignore b/app/.gitignore similarity index 100% rename from AffdexMe/app/.gitignore rename to app/.gitignore diff --git a/AffdexMe/app/app.iml b/app/app.iml similarity index 100% rename from AffdexMe/app/app.iml rename to app/app.iml diff --git a/AffdexMe/app/build.gradle b/app/build.gradle similarity index 100% rename from AffdexMe/app/build.gradle rename to app/build.gradle diff --git a/AffdexMe/app/build.xml b/app/build.xml similarity index 100% rename from AffdexMe/app/build.xml rename to app/build.xml diff --git a/AffdexMe/app/proguard-rules.pro b/app/proguard-rules.pro similarity index 100% rename from AffdexMe/app/proguard-rules.pro rename to app/proguard-rules.pro diff --git a/AffdexMe/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AffdexMe/app/src/main/AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/AffdexMe/app/src/main/assets/fonts/Square.ttf b/app/src/main/assets/fonts/Square.ttf similarity index 100% rename from AffdexMe/app/src/main/assets/fonts/Square.ttf rename to app/src/main/assets/fonts/Square.ttf diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java b/app/src/main/java/com/affectiva/affdexme/DrawingView.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java rename to app/src/main/java/com/affectiva/affdexme/DrawingView.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java b/app/src/main/java/com/affectiva/affdexme/MainActivity.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java rename to app/src/main/java/com/affectiva/affdexme/MainActivity.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java b/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricDisplay.java rename to app/src/main/java/com/affectiva/affdexme/MetricDisplay.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java b/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java rename to app/src/main/java/com/affectiva/affdexme/MetricSelectionFragment.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java b/app/src/main/java/com/affectiva/affdexme/MetricSelector.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricSelector.java rename to app/src/main/java/com/affectiva/affdexme/MetricSelector.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java b/app/src/main/java/com/affectiva/affdexme/MetricsManager.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/MetricsManager.java rename to app/src/main/java/com/affectiva/affdexme/MetricsManager.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java b/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java rename to app/src/main/java/com/affectiva/affdexme/PreferencesUtils.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java b/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/affdexme/SettingsActivity.java rename to app/src/main/java/com/affectiva/affdexme/SettingsActivity.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java b/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/errorreporting/CustomApplication.java rename to app/src/main/java/com/affectiva/errorreporting/CustomApplication.java diff --git a/AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java b/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java similarity index 100% rename from AffdexMe/app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java rename to app/src/main/java/com/affectiva/errorreporting/ErrorReporter.java diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png b/app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png rename to app/src/main/res/drawable-hdpi/affectiva_logo_clear_background.png diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png rename to app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/settings_button.png b/app/src/main/res/drawable-hdpi/settings_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-hdpi/settings_button.png rename to app/src/main/res/drawable-hdpi/settings_button.png diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png b/app/src/main/res/drawable-hdpi/settings_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-hdpi/settings_button_pressed.png rename to app/src/main/res/drawable-hdpi/settings_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button.png b/app/src/main/res/drawable-hdpi/switch_camera_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button.png rename to app/src/main/res/drawable-hdpi/switch_camera_button.png diff --git a/AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png b/app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png rename to app/src/main/res/drawable-hdpi/switch_camera_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png b/app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png rename to app/src/main/res/drawable-mdpi/affectiva_logo_clear_background.png diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png rename to app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/settings_button.png b/app/src/main/res/drawable-mdpi/settings_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-mdpi/settings_button.png rename to app/src/main/res/drawable-mdpi/settings_button.png diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png b/app/src/main/res/drawable-mdpi/settings_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-mdpi/settings_button_pressed.png rename to app/src/main/res/drawable-mdpi/settings_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button.png b/app/src/main/res/drawable-mdpi/switch_camera_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button.png rename to app/src/main/res/drawable-mdpi/switch_camera_button.png diff --git a/AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png b/app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png rename to app/src/main/res/drawable-mdpi/switch_camera_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg b/app/src/main/res/drawable-nodpi/anger.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/anger.jpg rename to app/src/main/res/drawable-nodpi/anger.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg b/app/src/main/res/drawable-nodpi/attention.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/attention.jpg rename to app/src/main/res/drawable-nodpi/attention.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg b/app/src/main/res/drawable-nodpi/brow_furrow.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/brow_furrow.jpg rename to app/src/main/res/drawable-nodpi/brow_furrow.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg b/app/src/main/res/drawable-nodpi/brow_raise.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/brow_raise.jpg rename to app/src/main/res/drawable-nodpi/brow_raise.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg b/app/src/main/res/drawable-nodpi/chin_raise.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/chin_raise.jpg rename to app/src/main/res/drawable-nodpi/chin_raise.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg b/app/src/main/res/drawable-nodpi/contempt.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/contempt.jpg rename to app/src/main/res/drawable-nodpi/contempt.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg b/app/src/main/res/drawable-nodpi/disgust.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/disgust.jpg rename to app/src/main/res/drawable-nodpi/disgust.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg b/app/src/main/res/drawable-nodpi/engagement.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/engagement.jpg rename to app/src/main/res/drawable-nodpi/engagement.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg b/app/src/main/res/drawable-nodpi/eye_closure.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/eye_closure.jpg rename to app/src/main/res/drawable-nodpi/eye_closure.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg b/app/src/main/res/drawable-nodpi/fear.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/fear.jpg rename to app/src/main/res/drawable-nodpi/fear.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg b/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/inner_brow_raise.jpg rename to app/src/main/res/drawable-nodpi/inner_brow_raise.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg b/app/src/main/res/drawable-nodpi/joy.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/joy.jpg rename to app/src/main/res/drawable-nodpi/joy.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg b/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg rename to app/src/main/res/drawable-nodpi/lip_corner_depressor.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg b/app/src/main/res/drawable-nodpi/lip_press.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/lip_press.jpg rename to app/src/main/res/drawable-nodpi/lip_press.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg b/app/src/main/res/drawable-nodpi/lip_pucker.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/lip_pucker.jpg rename to app/src/main/res/drawable-nodpi/lip_pucker.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg b/app/src/main/res/drawable-nodpi/lip_suck.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/lip_suck.jpg rename to app/src/main/res/drawable-nodpi/lip_suck.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg b/app/src/main/res/drawable-nodpi/mouth_open.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/mouth_open.jpg rename to app/src/main/res/drawable-nodpi/mouth_open.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg b/app/src/main/res/drawable-nodpi/negative_valence.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/negative_valence.jpg rename to app/src/main/res/drawable-nodpi/negative_valence.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg b/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/nose_wrinkle.jpg rename to app/src/main/res/drawable-nodpi/nose_wrinkle.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg b/app/src/main/res/drawable-nodpi/sadness.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/sadness.jpg rename to app/src/main/res/drawable-nodpi/sadness.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg b/app/src/main/res/drawable-nodpi/smile.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/smile.jpg rename to app/src/main/res/drawable-nodpi/smile.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg b/app/src/main/res/drawable-nodpi/smirk.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/smirk.jpg rename to app/src/main/res/drawable-nodpi/smirk.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg b/app/src/main/res/drawable-nodpi/surprise.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/surprise.jpg rename to app/src/main/res/drawable-nodpi/surprise.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg b/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/upper_lip_raise.jpg rename to app/src/main/res/drawable-nodpi/upper_lip_raise.jpg diff --git a/AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg b/app/src/main/res/drawable-nodpi/valence.jpg similarity index 100% rename from AffdexMe/app/src/main/res/drawable-nodpi/valence.jpg rename to app/src/main/res/drawable-nodpi/valence.jpg diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png b/app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png rename to app/src/main/res/drawable-xhdpi/affectiva_logo_clear_background.png diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png rename to app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/settings_button.png b/app/src/main/res/drawable-xhdpi/settings_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xhdpi/settings_button.png rename to app/src/main/res/drawable-xhdpi/settings_button.png diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png b/app/src/main/res/drawable-xhdpi/settings_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xhdpi/settings_button_pressed.png rename to app/src/main/res/drawable-xhdpi/settings_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button.png b/app/src/main/res/drawable-xhdpi/switch_camera_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button.png rename to app/src/main/res/drawable-xhdpi/switch_camera_button.png diff --git a/AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png b/app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png rename to app/src/main/res/drawable-xhdpi/switch_camera_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png b/app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png rename to app/src/main/res/drawable-xxhdpi/affectiva_logo_clear_background.png diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png rename to app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button.png b/app/src/main/res/drawable-xxhdpi/settings_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button.png rename to app/src/main/res/drawable-xxhdpi/settings_button.png diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png b/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xxhdpi/settings_button_pressed.png rename to app/src/main/res/drawable-xxhdpi/settings_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button.png b/app/src/main/res/drawable-xxhdpi/switch_camera_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button.png rename to app/src/main/res/drawable-xxhdpi/switch_camera_button.png diff --git a/AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png b/app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png rename to app/src/main/res/drawable-xxhdpi/switch_camera_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png b/app/src/main/res/drawable/affectiva_logo_clear_background.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable/affectiva_logo_clear_background.png rename to app/src/main/res/drawable/affectiva_logo_clear_background.png diff --git a/AffdexMe/app/src/main/res/drawable/camera_button_selector.xml b/app/src/main/res/drawable/camera_button_selector.xml similarity index 100% rename from AffdexMe/app/src/main/res/drawable/camera_button_selector.xml rename to app/src/main/res/drawable/camera_button_selector.xml diff --git a/AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable/ic_arrow_back_white_24dp.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable/ic_arrow_back_white_24dp.png rename to app/src/main/res/drawable/ic_arrow_back_white_24dp.png diff --git a/AffdexMe/app/src/main/res/drawable/settings_button.png b/app/src/main/res/drawable/settings_button.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable/settings_button.png rename to app/src/main/res/drawable/settings_button.png diff --git a/AffdexMe/app/src/main/res/drawable/settings_button_pressed.png b/app/src/main/res/drawable/settings_button_pressed.png similarity index 100% rename from AffdexMe/app/src/main/res/drawable/settings_button_pressed.png rename to app/src/main/res/drawable/settings_button_pressed.png diff --git a/AffdexMe/app/src/main/res/drawable/settings_button_selector.xml b/app/src/main/res/drawable/settings_button_selector.xml similarity index 100% rename from AffdexMe/app/src/main/res/drawable/settings_button_selector.xml rename to app/src/main/res/drawable/settings_button_selector.xml diff --git a/AffdexMe/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml similarity index 100% rename from AffdexMe/app/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout/activity_main.xml diff --git a/AffdexMe/app/src/main/res/layout/error_reporter.xml b/app/src/main/res/layout/error_reporter.xml similarity index 100% rename from AffdexMe/app/src/main/res/layout/error_reporter.xml rename to app/src/main/res/layout/error_reporter.xml diff --git a/AffdexMe/app/src/main/res/layout/grid_header.xml b/app/src/main/res/layout/grid_header.xml similarity index 100% rename from AffdexMe/app/src/main/res/layout/grid_header.xml rename to app/src/main/res/layout/grid_header.xml diff --git a/AffdexMe/app/src/main/res/layout/grid_item.xml b/app/src/main/res/layout/grid_item.xml similarity index 100% rename from AffdexMe/app/src/main/res/layout/grid_item.xml rename to app/src/main/res/layout/grid_item.xml diff --git a/AffdexMe/app/src/main/res/layout/metric_chooser.xml b/app/src/main/res/layout/metric_chooser.xml similarity index 100% rename from AffdexMe/app/src/main/res/layout/metric_chooser.xml rename to app/src/main/res/layout/metric_chooser.xml diff --git a/AffdexMe/app/src/main/res/layout/metric_layout.xml b/app/src/main/res/layout/metric_layout.xml similarity index 100% rename from AffdexMe/app/src/main/res/layout/metric_layout.xml rename to app/src/main/res/layout/metric_layout.xml diff --git a/AffdexMe/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from AffdexMe/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/AffdexMe/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from AffdexMe/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/AffdexMe/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from AffdexMe/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/AffdexMe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from AffdexMe/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/AffdexMe/app/src/main/res/raw/anger.mp4 b/app/src/main/res/raw/anger.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/anger.mp4 rename to app/src/main/res/raw/anger.mp4 diff --git a/AffdexMe/app/src/main/res/raw/attention.mp4 b/app/src/main/res/raw/attention.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/attention.mp4 rename to app/src/main/res/raw/attention.mp4 diff --git a/AffdexMe/app/src/main/res/raw/brow_furrow.mp4 b/app/src/main/res/raw/brow_furrow.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/brow_furrow.mp4 rename to app/src/main/res/raw/brow_furrow.mp4 diff --git a/AffdexMe/app/src/main/res/raw/brow_raise.mp4 b/app/src/main/res/raw/brow_raise.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/brow_raise.mp4 rename to app/src/main/res/raw/brow_raise.mp4 diff --git a/AffdexMe/app/src/main/res/raw/chin_raise.mp4 b/app/src/main/res/raw/chin_raise.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/chin_raise.mp4 rename to app/src/main/res/raw/chin_raise.mp4 diff --git a/AffdexMe/app/src/main/res/raw/contempt.mp4 b/app/src/main/res/raw/contempt.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/contempt.mp4 rename to app/src/main/res/raw/contempt.mp4 diff --git a/AffdexMe/app/src/main/res/raw/disgust.mp4 b/app/src/main/res/raw/disgust.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/disgust.mp4 rename to app/src/main/res/raw/disgust.mp4 diff --git a/AffdexMe/app/src/main/res/raw/engagement.mp4 b/app/src/main/res/raw/engagement.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/engagement.mp4 rename to app/src/main/res/raw/engagement.mp4 diff --git a/AffdexMe/app/src/main/res/raw/eye_closure.mp4 b/app/src/main/res/raw/eye_closure.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/eye_closure.mp4 rename to app/src/main/res/raw/eye_closure.mp4 diff --git a/AffdexMe/app/src/main/res/raw/fear.mp4 b/app/src/main/res/raw/fear.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/fear.mp4 rename to app/src/main/res/raw/fear.mp4 diff --git a/AffdexMe/app/src/main/res/raw/inner_brow_raise.mp4 b/app/src/main/res/raw/inner_brow_raise.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/inner_brow_raise.mp4 rename to app/src/main/res/raw/inner_brow_raise.mp4 diff --git a/AffdexMe/app/src/main/res/raw/joy.mp4 b/app/src/main/res/raw/joy.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/joy.mp4 rename to app/src/main/res/raw/joy.mp4 diff --git a/AffdexMe/app/src/main/res/raw/lip_corner_depressor.mp4 b/app/src/main/res/raw/lip_corner_depressor.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/lip_corner_depressor.mp4 rename to app/src/main/res/raw/lip_corner_depressor.mp4 diff --git a/AffdexMe/app/src/main/res/raw/lip_press.mp4 b/app/src/main/res/raw/lip_press.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/lip_press.mp4 rename to app/src/main/res/raw/lip_press.mp4 diff --git a/AffdexMe/app/src/main/res/raw/lip_pucker.mp4 b/app/src/main/res/raw/lip_pucker.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/lip_pucker.mp4 rename to app/src/main/res/raw/lip_pucker.mp4 diff --git a/AffdexMe/app/src/main/res/raw/lip_suck.mp4 b/app/src/main/res/raw/lip_suck.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/lip_suck.mp4 rename to app/src/main/res/raw/lip_suck.mp4 diff --git a/AffdexMe/app/src/main/res/raw/mouth_open.mp4 b/app/src/main/res/raw/mouth_open.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/mouth_open.mp4 rename to app/src/main/res/raw/mouth_open.mp4 diff --git a/AffdexMe/app/src/main/res/raw/nose_wrinkle.mp4 b/app/src/main/res/raw/nose_wrinkle.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/nose_wrinkle.mp4 rename to app/src/main/res/raw/nose_wrinkle.mp4 diff --git a/AffdexMe/app/src/main/res/raw/sadness.mp4 b/app/src/main/res/raw/sadness.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/sadness.mp4 rename to app/src/main/res/raw/sadness.mp4 diff --git a/AffdexMe/app/src/main/res/raw/smile.mp4 b/app/src/main/res/raw/smile.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/smile.mp4 rename to app/src/main/res/raw/smile.mp4 diff --git a/AffdexMe/app/src/main/res/raw/smirk.mp4 b/app/src/main/res/raw/smirk.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/smirk.mp4 rename to app/src/main/res/raw/smirk.mp4 diff --git a/AffdexMe/app/src/main/res/raw/surprise.mp4 b/app/src/main/res/raw/surprise.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/surprise.mp4 rename to app/src/main/res/raw/surprise.mp4 diff --git a/AffdexMe/app/src/main/res/raw/upper_lip_raise.mp4 b/app/src/main/res/raw/upper_lip_raise.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/upper_lip_raise.mp4 rename to app/src/main/res/raw/upper_lip_raise.mp4 diff --git a/AffdexMe/app/src/main/res/raw/valence.mp4 b/app/src/main/res/raw/valence.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/valence.mp4 rename to app/src/main/res/raw/valence.mp4 diff --git a/AffdexMe/app/src/main/res/raw/valence0.mp4 b/app/src/main/res/raw/valence0.mp4 similarity index 100% rename from AffdexMe/app/src/main/res/raw/valence0.mp4 rename to app/src/main/res/raw/valence0.mp4 diff --git a/AffdexMe/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml similarity index 100% rename from AffdexMe/app/src/main/res/values-large/dimens.xml rename to app/src/main/res/values-large/dimens.xml diff --git a/AffdexMe/app/src/main/res/values-normal/dimens.xml b/app/src/main/res/values-normal/dimens.xml similarity index 100% rename from AffdexMe/app/src/main/res/values-normal/dimens.xml rename to app/src/main/res/values-normal/dimens.xml diff --git a/AffdexMe/app/src/main/res/values-small/dimens.xml b/app/src/main/res/values-small/dimens.xml similarity index 100% rename from AffdexMe/app/src/main/res/values-small/dimens.xml rename to app/src/main/res/values-small/dimens.xml diff --git a/AffdexMe/app/src/main/res/values-xlarge/dimens.xml b/app/src/main/res/values-xlarge/dimens.xml similarity index 100% rename from AffdexMe/app/src/main/res/values-xlarge/dimens.xml rename to app/src/main/res/values-xlarge/dimens.xml diff --git a/AffdexMe/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/attrs.xml rename to app/src/main/res/values/attrs.xml diff --git a/AffdexMe/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/colors.xml rename to app/src/main/res/values/colors.xml diff --git a/AffdexMe/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/dimens.xml rename to app/src/main/res/values/dimens.xml diff --git a/AffdexMe/app/src/main/res/values/metricStyleName.xml b/app/src/main/res/values/metricStyleName.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/metricStyleName.xml rename to app/src/main/res/values/metricStyleName.xml diff --git a/AffdexMe/app/src/main/res/values/metricStylePct.xml b/app/src/main/res/values/metricStylePct.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/metricStylePct.xml rename to app/src/main/res/values/metricStylePct.xml diff --git a/AffdexMe/app/src/main/res/values/optionsStyle.xml b/app/src/main/res/values/optionsStyle.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/optionsStyle.xml rename to app/src/main/res/values/optionsStyle.xml diff --git a/AffdexMe/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/strings.xml rename to app/src/main/res/values/strings.xml diff --git a/AffdexMe/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml similarity index 100% rename from AffdexMe/app/src/main/res/values/styles.xml rename to app/src/main/res/values/styles.xml diff --git a/AffdexMe/app/src/main/res/xml/preference_headers.xml b/app/src/main/res/xml/preference_headers.xml similarity index 100% rename from AffdexMe/app/src/main/res/xml/preference_headers.xml rename to app/src/main/res/xml/preference_headers.xml diff --git a/AffdexMe/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml similarity index 100% rename from AffdexMe/app/src/main/res/xml/settings_preferences.xml rename to app/src/main/res/xml/settings_preferences.xml diff --git a/AffdexMe/build.gradle b/build.gradle similarity index 100% rename from AffdexMe/build.gradle rename to build.gradle diff --git a/AffdexMe/gradle.properties b/gradle.properties similarity index 100% rename from AffdexMe/gradle.properties rename to gradle.properties diff --git a/AffdexMe/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from AffdexMe/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/AffdexMe/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from AffdexMe/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/AffdexMe/gradlew b/gradlew similarity index 100% rename from AffdexMe/gradlew rename to gradlew diff --git a/AffdexMe/gradlew.bat b/gradlew.bat similarity index 100% rename from AffdexMe/gradlew.bat rename to gradlew.bat diff --git a/AffdexMe/settings.gradle b/settings.gradle similarity index 100% rename from AffdexMe/settings.gradle rename to settings.gradle