diff --git a/flarebar/.gitignore b/.gitignore
similarity index 100%
rename from flarebar/.gitignore
rename to .gitignore
diff --git a/flarebar/.idea/compiler.xml b/.idea/compiler.xml
similarity index 100%
rename from flarebar/.idea/compiler.xml
rename to .idea/compiler.xml
diff --git a/flarebar/.idea/gradle.xml b/.idea/gradle.xml
similarity index 100%
rename from flarebar/.idea/gradle.xml
rename to .idea/gradle.xml
diff --git a/flarebar/.idea/misc.xml b/.idea/misc.xml
similarity index 100%
rename from flarebar/.idea/misc.xml
rename to .idea/misc.xml
diff --git a/flarebar/.idea/modules.xml b/.idea/modules.xml
similarity index 100%
rename from flarebar/.idea/modules.xml
rename to .idea/modules.xml
diff --git a/flarebar/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
similarity index 100%
rename from flarebar/.idea/runConfigurations.xml
rename to .idea/runConfigurations.xml
diff --git a/flarebar/app/.gitignore b/app/.gitignore
similarity index 100%
rename from flarebar/app/.gitignore
rename to app/.gitignore
diff --git a/flarebar/app/build.gradle b/app/build.gradle
similarity index 100%
rename from flarebar/app/build.gradle
rename to app/build.gradle
diff --git a/flarebar/app/proguard-rules.pro b/app/proguard-rules.pro
similarity index 100%
rename from flarebar/app/proguard-rules.pro
rename to app/proguard-rules.pro
diff --git a/flarebar/app/src/androidTest/java/com/flarebit/flarebar/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/flarebit/flarebar/ExampleInstrumentedTest.java
similarity index 100%
rename from flarebar/app/src/androidTest/java/com/flarebit/flarebar/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/flarebit/flarebar/ExampleInstrumentedTest.java
diff --git a/flarebar/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 100%
rename from flarebar/app/src/main/AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
diff --git a/flarebar/app/src/main/java/com/flarebit/flarebar/MainActivity.java b/app/src/main/java/com/flarebit/flarebar/MainActivity.java
similarity index 100%
rename from flarebar/app/src/main/java/com/flarebit/flarebar/MainActivity.java
rename to app/src/main/java/com/flarebit/flarebar/MainActivity.java
diff --git a/flarebar/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from flarebar/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/flarebar/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from flarebar/app/src/main/res/drawable/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/flarebar/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
similarity index 100%
rename from flarebar/app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_main.xml
diff --git a/flarebar/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/flarebar/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/flarebar/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/flarebar/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/flarebar/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/flarebar/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/flarebar/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/flarebar/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/flarebar/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/flarebar/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/flarebar/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/flarebar/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from flarebar/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/flarebar/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from flarebar/app/src/main/res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/flarebar/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from flarebar/app/src/main/res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/flarebar/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from flarebar/app/src/main/res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/flarebar/app/src/test/java/com/flarebit/flarebar/ExampleUnitTest.java b/app/src/test/java/com/flarebit/flarebar/ExampleUnitTest.java
similarity index 100%
rename from flarebar/app/src/test/java/com/flarebit/flarebar/ExampleUnitTest.java
rename to app/src/test/java/com/flarebit/flarebar/ExampleUnitTest.java
diff --git a/flarebar/build.gradle b/build.gradle
similarity index 100%
rename from flarebar/build.gradle
rename to build.gradle
diff --git a/flarebar/flarebarlib/.gitignore b/flarebarlib/.gitignore
similarity index 100%
rename from flarebar/flarebarlib/.gitignore
rename to flarebarlib/.gitignore
diff --git a/flarebar/flarebarlib/build.gradle b/flarebarlib/build.gradle
similarity index 100%
rename from flarebar/flarebarlib/build.gradle
rename to flarebarlib/build.gradle
diff --git a/flarebar/flarebarlib/proguard-rules.pro b/flarebarlib/proguard-rules.pro
similarity index 100%
rename from flarebar/flarebarlib/proguard-rules.pro
rename to flarebarlib/proguard-rules.pro
diff --git a/flarebar/flarebarlib/src/androidTest/java/com/flarebit/flarebarlib/ExampleInstrumentedTest.java b/flarebarlib/src/androidTest/java/com/flarebit/flarebarlib/ExampleInstrumentedTest.java
similarity index 100%
rename from flarebar/flarebarlib/src/androidTest/java/com/flarebit/flarebarlib/ExampleInstrumentedTest.java
rename to flarebarlib/src/androidTest/java/com/flarebit/flarebarlib/ExampleInstrumentedTest.java
diff --git a/flarebar/flarebarlib/src/main/AndroidManifest.xml b/flarebarlib/src/main/AndroidManifest.xml
similarity index 100%
rename from flarebar/flarebarlib/src/main/AndroidManifest.xml
rename to flarebarlib/src/main/AndroidManifest.xml
diff --git a/flarebar/flarebarlib/src/main/java/com/flarebit/flarebarlib/FlareBar.java b/flarebarlib/src/main/java/com/flarebit/flarebarlib/FlareBar.java
similarity index 100%
rename from flarebar/flarebarlib/src/main/java/com/flarebit/flarebarlib/FlareBar.java
rename to flarebarlib/src/main/java/com/flarebit/flarebarlib/FlareBar.java
diff --git a/flarebar/flarebarlib/src/main/java/com/flarebit/flarebarlib/Flaretab.java b/flarebarlib/src/main/java/com/flarebit/flarebarlib/Flaretab.java
similarity index 100%
rename from flarebar/flarebarlib/src/main/java/com/flarebit/flarebarlib/Flaretab.java
rename to flarebarlib/src/main/java/com/flarebit/flarebarlib/Flaretab.java
diff --git a/flarebar/flarebarlib/src/main/java/com/flarebit/flarebarlib/TabEventObject.java b/flarebarlib/src/main/java/com/flarebit/flarebarlib/TabEventObject.java
similarity index 100%
rename from flarebar/flarebarlib/src/main/java/com/flarebit/flarebarlib/TabEventObject.java
rename to flarebarlib/src/main/java/com/flarebit/flarebarlib/TabEventObject.java
diff --git a/flarebar/flarebarlib/src/main/res/drawable/avatar.png b/flarebarlib/src/main/res/drawable/avatar.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/avatar.png
rename to flarebarlib/src/main/res/drawable/avatar.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/avatarb.png b/flarebarlib/src/main/res/drawable/avatarb.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/avatarb.png
rename to flarebarlib/src/main/res/drawable/avatarb.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/badge_round_bg.xml b/flarebarlib/src/main/res/drawable/badge_round_bg.xml
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/badge_round_bg.xml
rename to flarebarlib/src/main/res/drawable/badge_round_bg.xml
diff --git a/flarebar/flarebarlib/src/main/res/drawable/inbox.png b/flarebarlib/src/main/res/drawable/inbox.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/inbox.png
rename to flarebarlib/src/main/res/drawable/inbox.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/inboxb.png b/flarebarlib/src/main/res/drawable/inboxb.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/inboxb.png
rename to flarebarlib/src/main/res/drawable/inboxb.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/phone.png b/flarebarlib/src/main/res/drawable/phone.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/phone.png
rename to flarebarlib/src/main/res/drawable/phone.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/phoneb.png b/flarebarlib/src/main/res/drawable/phoneb.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/phoneb.png
rename to flarebarlib/src/main/res/drawable/phoneb.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/search.png b/flarebarlib/src/main/res/drawable/search.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/search.png
rename to flarebarlib/src/main/res/drawable/search.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/searchb.png b/flarebarlib/src/main/res/drawable/searchb.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/searchb.png
rename to flarebarlib/src/main/res/drawable/searchb.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/settings.png b/flarebarlib/src/main/res/drawable/settings.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/settings.png
rename to flarebarlib/src/main/res/drawable/settings.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/settingsb.png b/flarebarlib/src/main/res/drawable/settingsb.png
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/settingsb.png
rename to flarebarlib/src/main/res/drawable/settingsb.png
diff --git a/flarebar/flarebarlib/src/main/res/drawable/tabs_corner_bg.xml b/flarebarlib/src/main/res/drawable/tabs_corner_bg.xml
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/drawable/tabs_corner_bg.xml
rename to flarebarlib/src/main/res/drawable/tabs_corner_bg.xml
diff --git a/flarebar/flarebarlib/src/main/res/values/strings.xml b/flarebarlib/src/main/res/values/strings.xml
similarity index 100%
rename from flarebar/flarebarlib/src/main/res/values/strings.xml
rename to flarebarlib/src/main/res/values/strings.xml
diff --git a/flarebar/flarebarlib/src/test/java/com/flarebit/flarebarlib/ExampleUnitTest.java b/flarebarlib/src/test/java/com/flarebit/flarebarlib/ExampleUnitTest.java
similarity index 100%
rename from flarebar/flarebarlib/src/test/java/com/flarebit/flarebarlib/ExampleUnitTest.java
rename to flarebarlib/src/test/java/com/flarebit/flarebarlib/ExampleUnitTest.java
diff --git a/flarebar/gradle.properties b/gradle.properties
similarity index 100%
rename from flarebar/gradle.properties
rename to gradle.properties
diff --git a/flarebar/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from flarebar/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/flarebar/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from flarebar/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/flarebar/gradlew b/gradlew
similarity index 100%
rename from flarebar/gradlew
rename to gradlew
diff --git a/flarebar/gradlew.bat b/gradlew.bat
similarity index 100%
rename from flarebar/gradlew.bat
rename to gradlew.bat
diff --git a/flarebar/settings.gradle b/settings.gradle
similarity index 100%
rename from flarebar/settings.gradle
rename to settings.gradle