diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 4157cb1..c3a133f 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5e73d4b..af0bbdd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,31 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="6">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="5">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index 7d023e8..3e03bbc 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -13,8 +13,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="25" />
-                            <option name="y" value="325" />
+                            <option name="x" value="256" />
+                            <option name="y" value="280" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -25,8 +25,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="475" />
-                            <option name="y" value="400" />
+                            <option name="x" value="12" />
+                            <option name="y" value="280" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -46,8 +46,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="250" />
-                            <option name="y" value="25" />
+                            <option name="x" value="12" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -58,8 +58,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="250" />
-                            <option name="y" value="400" />
+                            <option name="x" value="324" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -79,8 +79,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="25" />
-                            <option name="y" value="700" />
+                            <option name="x" value="412" />
+                            <option name="y" value="280" />
                           </Point>
                         </option>
                         <option name="myPositions">
@@ -100,8 +100,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="475" />
-                            <option name="y" value="775" />
+                            <option name="x" value="168" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -112,8 +112,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="475" />
-                            <option name="y" value="25" />
+                            <option name="x" value="568" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -124,8 +124,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="250" />
-                            <option name="y" value="775" />
+                            <option name="x" value="656" />
+                            <option name="y" value="280" />
                           </Point>
                         </option>
                       </LayoutPositions>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/app/.gitignore b/app/.gitignore
old mode 100644
new mode 100755
diff --git a/app/build.gradle b/app/build.gradle
old mode 100644
new mode 100755
index 10fe14b..d006b4b
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,15 +5,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 apply plugin: 'kotlin-kapt'
+
+apply plugin: "androidx.navigation.safeargs"
+
 android {
-    compileSdkVersion 'android-P'
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.levimoreira.teammenagerapp"
         minSdkVersion 21
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -24,37 +27,35 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    def room_version = "1.1.0"
-    def lifecycle_version = "1.1.1"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    def room_version = '2.0.0-beta01'
+    def lifecycle_version = '2.0.0-beta01'
     def dagger = "2.16"
+    def nav_version = "1.0.0-rc01"
     // ViewModel and LiveData
-    implementation "android.arch.lifecycle:extensions:$lifecycle_version"
-    implementation "android.arch.lifecycle:reactivestreams:$lifecycle_version"
-    kapt "android.arch.lifecycle:compiler:$lifecycle_version"
-
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycle_version"
+    kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
     //rx
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.14-RC1'
-
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.14'
     //dagger
     implementation "com.google.dagger:dagger:$dagger"
     implementation "com.google.dagger:dagger-android-support:$dagger"
     kapt "com.google.dagger:dagger-compiler:$dagger"
     kapt "com.google.dagger:dagger-android-processor:$dagger"
-
-    implementation "android.arch.persistence.room:runtime:$room_version"
-    implementation "android.arch.persistence.room:rxjava2:$room_version"
-    kapt "android.arch.persistence.room:compiler:$room_version"
+    implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-rxjava2:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-
-    implementation 'com.android.support:appcompat-v7:28.0.0-alpha1'
-    implementation 'com.android.support:design:28.0.0-alpha1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'com.android.support:support-v4:28.0.0-alpha1'
+    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
+    implementation 'com.google.android.material:material:1.0.0-beta01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha01'
-    implementation "android.arch.navigation:navigation-ui-ktx:1.0.0-alpha01" // use -ktx for Kotlin
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
+    implementation "android.arch.navigation:navigation-fragment:$nav_version" // For Kotlin use navigation-fragment-ktx
+    implementation "android.arch.navigation:navigation-ui:$nav_version"
+    // use -ktx for Kotlin
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
old mode 100644
new mode 100755
diff --git a/app/src/androidTest/java/com/levimoreira/teammenagerapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/levimoreira/teammenagerapp/ExampleInstrumentedTest.kt
old mode 100644
new mode 100755
index 90529da..892713b
--- a/app/src/androidTest/java/com/levimoreira/teammenagerapp/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/levimoreira/teammenagerapp/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package com.levimoreira.teammenagerapp
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/ExtensionUtils.kt b/app/src/main/java/com/levimoreira/teammenagerapp/ExtensionUtils.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/TeamManagerApplication.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/TeamManagerApplication.kt
old mode 100644
new mode 100755
index 95e94c0..b01113f
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/TeamManagerApplication.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/TeamManagerApplication.kt
@@ -2,7 +2,7 @@ package com.levimoreira.teammenagerapp.application
 
 import android.app.Activity
 import android.app.Application
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import com.levimoreira.teammenagerapp.application.di.DaggerApplicationComponent
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -19,7 +19,7 @@ class TeamManagerApplication : Application(), HasSupportFragmentInjector {
     lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
 
     @Inject
-    lateinit var supportFragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+    lateinit var supportFragmentDispatchingAndroidInjector: DispatchingAndroidInjector<androidx.fragment.app.Fragment>
 
     private fun initDagger() {
         DaggerApplicationComponent
@@ -33,7 +33,7 @@ class TeamManagerApplication : Application(), HasSupportFragmentInjector {
         return activityDispatchingAndroidInjector
     }
 
-    override fun supportFragmentInjector(): AndroidInjector<Fragment> {
+    override fun supportFragmentInjector(): AndroidInjector<androidx.fragment.app.Fragment> {
         return supportFragmentDispatchingAndroidInjector
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/data/AppDatabase.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/data/AppDatabase.kt
old mode 100644
new mode 100755
index aed7a6b..69a4719
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/data/AppDatabase.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/data/AppDatabase.kt
@@ -1,15 +1,16 @@
 package com.levimoreira.teammenagerapp.application.data
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.Database
+import androidx.room.RoomDatabase
 import com.levimoreira.teammenagerapp.application.entities.Business
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson
 import com.levimoreira.teammenagerapp.application.entities.Organization
 import com.levimoreira.teammenagerapp.application.entities.Person
 import com.levimoreira.teammenagerapp.business.data.BusinessDao
 import com.levimoreira.teammenagerapp.organization.data.OrganizationDao
 import com.levimoreira.teammenagerapp.person.data.PersonDao
 
-@Database(entities = [(Person::class), (Organization::class), (Business::class)], version = 3)
+@Database(entities = [(Person::class), (Organization::class), (Business::class), (BusinessPerson::class)], version = 3)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun personDao(): PersonDao
     abstract fun organizationDao(): OrganizationDao
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/ApplicationComponent.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/ApplicationComponent.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactory.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactory.kt
old mode 100644
new mode 100755
index ed0fb63..a50f285
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactory.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactory.kt
@@ -1,7 +1,7 @@
 package com.levimoreira.teammenagerapp.application.di
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import javax.inject.Inject
 import javax.inject.Provider
 import javax.inject.Singleton
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactoryModule.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactoryModule.kt
old mode 100644
new mode 100755
index 140b85c..58211d6
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactoryModule.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/DaggerViewModelFactoryModule.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.application.di
 
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/FragmentBuilder.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/FragmentBuilder.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/RepositoryModule.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/RepositoryModule.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/RoomModule.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/RoomModule.kt
old mode 100644
new mode 100755
index 46ecf52..daf7f29
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/RoomModule.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/RoomModule.kt
@@ -1,7 +1,7 @@
 package com.levimoreira.teammenagerapp.application.di
 
 import android.app.Application
-import android.arch.persistence.room.Room
+import androidx.room.Room
 import com.levimoreira.teammenagerapp.application.data.AppDatabase
 import com.levimoreira.teammenagerapp.business.data.BusinessDao
 import com.levimoreira.teammenagerapp.organization.data.OrganizationDao
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/ViewModelKey.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/ViewModelKey.kt
old mode 100644
new mode 100755
index 960c74f..cfeb413
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/di/ViewModelKey.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/di/ViewModelKey.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.application.di
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import dagger.MapKey
 import kotlin.reflect.KClass
 
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Address.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Address.kt
new file mode 100755
index 0000000..ffe502d
--- /dev/null
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Address.kt
@@ -0,0 +1,5 @@
+package com.levimoreira.teammenagerapp.application.entities
+
+data class Address(val street: String, val number: String) {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Business.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Business.kt
old mode 100644
new mode 100755
index 27d5ac8..7b11409
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Business.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Business.kt
@@ -1,9 +1,9 @@
 package com.levimoreira.teammenagerapp.application.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.PrimaryKey
 import com.levimoreira.teammenagerapp.application.entities.Business.Companion.TABLE_NAME
 
 
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/BusinessPerson.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/BusinessPerson.kt
new file mode 100755
index 0000000..e7835c8
--- /dev/null
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/BusinessPerson.kt
@@ -0,0 +1,29 @@
+package com.levimoreira.teammenagerapp.application.entities
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.ForeignKey.CASCADE
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson.Companion.COLUMN_BUSINESS
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson.Companion.COLUMN_PERSON
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson.Companion.TABLE_NAME
+
+@Entity(tableName = TABLE_NAME,
+        primaryKeys = [COLUMN_PERSON, COLUMN_BUSINESS],
+        foreignKeys = [(ForeignKey(entity = Person::class,
+                parentColumns = ["id"],
+                childColumns = [COLUMN_PERSON],
+                onDelete = ForeignKey.CASCADE)),
+            (ForeignKey(entity = Business::class,
+                    parentColumns = ["id"],
+                    childColumns = [COLUMN_BUSINESS],
+                    onDelete = CASCADE))]
+)
+data class BusinessPerson(@ColumnInfo(name = COLUMN_PERSON) var personId: Long,
+                          @ColumnInfo(name = COLUMN_BUSINESS) var businessId: Long) {
+    companion object {
+        const val TABLE_NAME = "business_person"
+        const val COLUMN_PERSON = "personId"
+        const val COLUMN_BUSINESS = "businessId"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Organization.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Organization.kt
old mode 100644
new mode 100755
index 88f3dce..ea86481
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Organization.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Organization.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.application.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import com.levimoreira.teammenagerapp.application.entities.Organization.Companion.TABLE_NAME
 
 
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Person.kt b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Person.kt
old mode 100644
new mode 100755
index e0218b5..09fa794
--- a/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Person.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/application/entities/Person.kt
@@ -1,8 +1,9 @@
 package com.levimoreira.teammenagerapp.application.entities
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import com.levimoreira.teammenagerapp.application.entities.Person.Companion.TABLE_NAME
 
 
@@ -10,7 +11,8 @@ import com.levimoreira.teammenagerapp.application.entities.Person.Companion.TABL
 data class Person(@PrimaryKey(autoGenerate = true) var id: Long?,
                   @ColumnInfo(name = COLUMN_NAME) var name: String,
                   @ColumnInfo(name = COLUMN_PHONE) var phone: String,
-                  @ColumnInfo(name = COLUMN_EMAIL) var email: String
+                  @ColumnInfo(name = COLUMN_EMAIL) var email: String,
+                  @Embedded var address: Address
 
 ) {
     companion object {
@@ -18,6 +20,5 @@ data class Person(@PrimaryKey(autoGenerate = true) var id: Long?,
         const val COLUMN_NAME = "name"
         const val COLUMN_PHONE = "phone"
         const val COLUMN_EMAIL = "email"
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/BusinessListAdapter.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/BusinessListAdapter.kt
old mode 100644
new mode 100755
index a033725..b27b02a
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/BusinessListAdapter.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/BusinessListAdapter.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.business.adapters
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import com.levimoreira.teammenagerapp.R
@@ -8,7 +8,7 @@ import com.levimoreira.teammenagerapp.application.entities.Business
 import com.levimoreira.teammenagerapp.inflate
 import kotlinx.android.synthetic.main.business_item_view.view.*
 
-class BusinessListAdapter(private val list: List<Business>) : RecyclerView.Adapter<BusinessListAdapter.BusinessViewHolder>() {
+class BusinessListAdapter(private val list: List<Business>) : androidx.recyclerview.widget.RecyclerView.Adapter<BusinessListAdapter.BusinessViewHolder>() {
     lateinit var clickListener: (Business) -> (Unit)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BusinessViewHolder = BusinessViewHolder(parent.inflate(R.layout.business_item_view))
@@ -21,7 +21,7 @@ class BusinessListAdapter(private val list: List<Business>) : RecyclerView.Adapt
     }
 
 
-    inner class BusinessViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class BusinessViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         fun bind(item: Business, clicklistener: (Business) -> Unit) = with(itemView) {
             title.text = item.title
             description.text = item.description
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/OrganizationSpinnerAdapter.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/OrganizationSpinnerAdapter.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/PersonSpinnerAdapter.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/adapters/PersonSpinnerAdapter.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/data/BusinessDao.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/data/BusinessDao.kt
old mode 100644
new mode 100755
index edde6f2..ae1b7f0
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/data/BusinessDao.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/data/BusinessDao.kt
@@ -1,11 +1,14 @@
 package com.levimoreira.teammenagerapp.business.data
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import com.levimoreira.teammenagerapp.application.entities.Business
+import com.levimoreira.teammenagerapp.application.entities.Business.Companion.COLUMN_PERSON
+import com.levimoreira.teammenagerapp.application.entities.BusinessPerson
 import com.levimoreira.teammenagerapp.application.entities.Organization
+import com.levimoreira.teammenagerapp.application.entities.Person
 import io.reactivex.Maybe
 import io.reactivex.Single
 
@@ -22,4 +25,14 @@ interface BusinessDao {
 
     @Query("DELETE FROM " + Business.TABLE_NAME + " WHERE id = :businessId")
     fun deleteById(businessId: Long): Int
+
+    @Query("SELECT * FROM " + Business.TABLE_NAME + " WHERE " + COLUMN_PERSON + " = :personId")
+    fun businessFromPerson(personId: Long): Single<List<Business>>
+
+    @Query("SELECT * FROM person INNER JOIN business_person ON person.id=business_person.personId WHERE business_person.businessId=:businessId")
+    fun getPersonForBusiness(businessId: Long): Single<List<Person>>
+
+    @Query("SELECT * FROM business INNER JOIN business_person ON business.id=business_person.businessId WHERE business_person.personId=:personId")
+    fun getBusinessForPerson(personId: Long): Single<List<Business>>
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/data/BusinessRepository.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/data/BusinessRepository.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/di/BusinessModule.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/di/BusinessModule.kt
old mode 100644
new mode 100755
index 2e419a3..dde47f2
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/di/BusinessModule.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/di/BusinessModule.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.business.di
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.di.ViewModelKey
 import com.levimoreira.teammenagerapp.business.viewmodel.BusinessItemViewModel
 import com.levimoreira.teammenagerapp.business.viewmodel.BusinessListViewModel
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessItemViewModel.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessItemViewModel.kt
old mode 100644
new mode 100755
index 35e6fac..4ab3af6
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessItemViewModel.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessItemViewModel.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.business.viewmodel
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.LiveDataReactiveStreams
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.LiveDataReactiveStreams
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.entities.Business
 import com.levimoreira.teammenagerapp.business.data.BusinessRepository
 import com.levimoreira.teammenagerapp.organization.data.OrganizationRepository
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessListViewModel.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessListViewModel.kt
old mode 100644
new mode 100755
index 3bd6095..3cc39f9
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessListViewModel.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/viewmodel/BusinessListViewModel.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.business.viewmodel
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.LiveDataReactiveStreams
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.LiveDataReactiveStreams
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.entities.Business
 import com.levimoreira.teammenagerapp.business.data.BusinessRepository
 import com.levimoreira.teammenagerapp.organization.data.OrganizationRepository
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessAddFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessAddFragment.kt
old mode 100644
new mode 100755
index 1d8b336..0e261e9
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessAddFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessAddFragment.kt
@@ -1,12 +1,12 @@
 package com.levimoreira.teammenagerapp.business.views
 
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.design.widget.Snackbar
+import com.google.android.material.snackbar.Snackbar
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessListFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessListFragment.kt
old mode 100644
new mode 100755
index 7e64868..1c44b1a
--- a/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessListFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/business/views/BusinessListFragment.kt
@@ -1,14 +1,14 @@
 package com.levimoreira.teammenagerapp.business.views
 
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -55,7 +55,8 @@ class BusinessListFragment : DaggerFragment(), LifecycleOwner {
             Toast.makeText(this.context, business.title, Toast.LENGTH_SHORT).show()
         }
 
-        businessRecyclerView.layoutManager = LinearLayoutManager(this.context)
+        businessRecyclerView.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(this.context)
         businessRecyclerView.adapter = adapter
 
         addBusiness.setOnClickListener {
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/home/HomeFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/home/HomeFragment.kt
old mode 100644
new mode 100755
index 5819b43..d466c4f
--- a/app/src/main/java/com/levimoreira/teammenagerapp/home/HomeFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/home/HomeFragment.kt
@@ -2,7 +2,7 @@ package com.levimoreira.teammenagerapp.home
 
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,7 +13,7 @@ import com.levimoreira.teammenagerapp.R
  *
  */
 
-class HomeFragment : Fragment() {
+class HomeFragment : androidx.fragment.app.Fragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         // Inflate the layout for this fragment
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/main/MainActivity.kt b/app/src/main/java/com/levimoreira/teammenagerapp/main/MainActivity.kt
old mode 100644
new mode 100755
index 1309c5a..bf94d8a
--- a/app/src/main/java/com/levimoreira/teammenagerapp/main/MainActivity.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/main/MainActivity.kt
@@ -1,23 +1,15 @@
 package com.levimoreira.teammenagerapp.main
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import android.util.Log
+import android.widget.Toast
 import androidx.navigation.Navigation
 import androidx.navigation.ui.NavigationUI.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import com.levimoreira.teammenagerapp.home.HomeFragment
 import com.levimoreira.teammenagerapp.R
-import com.levimoreira.teammenagerapp.business.views.BusinessAddFragment
-import com.levimoreira.teammenagerapp.business.views.BusinessListFragment
-import com.levimoreira.teammenagerapp.organization.views.OrganizationAddFragment
-import com.levimoreira.teammenagerapp.organization.views.OrganizationListFragment
-import com.levimoreira.teammenagerapp.person.view.PersonAddFragment
-import com.levimoreira.teammenagerapp.person.view.PersonListFragment
 import kotlinx.android.synthetic.main.activity_main.*
 
-
 class MainActivity : AppCompatActivity() {
     private val BACK_STACK_ROOT_TAG = "root_fragment"
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -28,12 +20,25 @@ class MainActivity : AppCompatActivity() {
 
     private fun setUpViews() {
         navigation.setupWithNavController(Navigation.findNavController(this, R.id.my_nav_host_fragment))
+
+        navigation.setOnNavigationItemSelectedListener { item ->
+
+            //            onNavDestinationSelected(item, Navigation.findNavController(this, R.id.my_nav_host_fragment))
+            Toast.makeText(this, item.itemId.toString(), Toast.LENGTH_SHORT).show()
+
+            val fragmentId = Navigation.findNavController(this, R.id.my_nav_host_fragment).currentDestination.id
+
+            val fragment = supportFragmentManager.findFragmentById(fragmentId)
+
+            Log.e("MainActivity", fragment?.toString())
+
+            return@setOnNavigationItemSelectedListener true
+
+        }
         setupActionBarWithNavController(this, Navigation.findNavController(this, R.id.my_nav_host_fragment))
     }
 
-
     override fun onSupportNavigateUp(): Boolean {
         return Navigation.findNavController(this, R.id.my_nav_host_fragment).navigateUp()
     }
-
 }
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/main/OnActivityCallback.kt b/app/src/main/java/com/levimoreira/teammenagerapp/main/OnActivityCallback.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/adapters/OrganizationListAdapter.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/adapters/OrganizationListAdapter.kt
old mode 100644
new mode 100755
index 191a0c4..fb768d6
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/adapters/OrganizationListAdapter.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/adapters/OrganizationListAdapter.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.organization.adapters
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import com.levimoreira.teammenagerapp.R
@@ -8,7 +8,7 @@ import com.levimoreira.teammenagerapp.application.entities.Organization
 import com.levimoreira.teammenagerapp.inflate
 import kotlinx.android.synthetic.main.organization_item_view.view.*
 
-class OrganizationListAdapter(private val list: List<Organization>) : RecyclerView.Adapter<OrganizationListAdapter.OrganizationViewHolder>() {
+class OrganizationListAdapter(private val list: List<Organization>) : androidx.recyclerview.widget.RecyclerView.Adapter<OrganizationListAdapter.OrganizationViewHolder>() {
     lateinit var clickListener: (Organization) -> (Unit)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OrganizationViewHolder = OrganizationViewHolder(parent.inflate(R.layout.organization_item_view))
@@ -21,7 +21,7 @@ class OrganizationListAdapter(private val list: List<Organization>) : RecyclerVi
     }
 
 
-    inner class OrganizationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class OrganizationViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         fun bind(item: Organization, clicklistener: (Organization) -> Unit) = with(itemView) {
             name.text = item.name
             phone.text = item.phone
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/data/OrganizationDao.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/data/OrganizationDao.kt
old mode 100644
new mode 100755
index c757ec5..4533098
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/data/OrganizationDao.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/data/OrganizationDao.kt
@@ -1,9 +1,9 @@
 package com.levimoreira.teammenagerapp.organization.data
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import com.levimoreira.teammenagerapp.application.entities.Organization
 import com.levimoreira.teammenagerapp.application.entities.Person
 import io.reactivex.Maybe
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/data/OrganizationRepository.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/data/OrganizationRepository.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/di/OrganizationModule.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/di/OrganizationModule.kt
old mode 100644
new mode 100755
index 7d1d1b5..a1913ff
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/di/OrganizationModule.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/di/OrganizationModule.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.organization.di
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.di.ViewModelKey
 import com.levimoreira.teammenagerapp.organization.viewmodel.OrganizationItemViewModel
 import com.levimoreira.teammenagerapp.organization.viewmodel.OrganizationListViewModel
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationItemViewModel.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationItemViewModel.kt
old mode 100644
new mode 100755
index 29f2948..7ee5a45
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationItemViewModel.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationItemViewModel.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.organization.viewmodel
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.LiveDataReactiveStreams
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.LiveDataReactiveStreams
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.entities.Organization
 import com.levimoreira.teammenagerapp.organization.data.OrganizationRepository
 import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationListViewModel.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationListViewModel.kt
old mode 100644
new mode 100755
index ec470fc..d0c011a
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationListViewModel.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/viewmodel/OrganizationListViewModel.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.organization.viewmodel
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.LiveDataReactiveStreams
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.LiveDataReactiveStreams
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.entities.Organization
 import com.levimoreira.teammenagerapp.organization.data.OrganizationRepository
 import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationAddFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationAddFragment.kt
old mode 100644
new mode 100755
index 0c330b6..38f71f4
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationAddFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationAddFragment.kt
@@ -1,13 +1,13 @@
 package com.levimoreira.teammenagerapp.organization.views
 
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
+import com.google.android.material.snackbar.Snackbar
+import androidx.fragment.app.Fragment
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationListFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationListFragment.kt
old mode 100644
new mode 100755
index d108e20..d25e593
--- a/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationListFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/organization/views/OrganizationListFragment.kt
@@ -1,15 +1,15 @@
 package com.levimoreira.teammenagerapp.organization.views
 
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.content.Context
 import android.os.Bundle
 import android.os.ProxyFileDescriptorCallback
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -54,7 +54,8 @@ class OrganizationListFragment : DaggerFragment(), LifecycleOwner {
             Toast.makeText(this.context, person.name, Toast.LENGTH_SHORT).show()
         }
 
-        organizationRecyclerView.layoutManager = LinearLayoutManager(this.context)
+        organizationRecyclerView.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(this.context)
         organizationRecyclerView.adapter = adapter
 
         addOrganization.setOnClickListener {
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/adapters/PersonListAdapter.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/adapters/PersonListAdapter.kt
old mode 100644
new mode 100755
index 5331b99..54afc9d
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/adapters/PersonListAdapter.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/adapters/PersonListAdapter.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.person.adapters
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import com.levimoreira.teammenagerapp.R
@@ -8,7 +8,7 @@ import com.levimoreira.teammenagerapp.application.entities.Person
 import com.levimoreira.teammenagerapp.inflate
 import kotlinx.android.synthetic.main.person_item_view.view.*
 
-class PersonListAdapter(val list: List<Person>) : RecyclerView.Adapter<PersonListAdapter.PersonViewHolder>() {
+class PersonListAdapter(val list: List<Person>) : androidx.recyclerview.widget.RecyclerView.Adapter<PersonListAdapter.PersonViewHolder>() {
 
     lateinit var clickListener: (Person) -> (Unit)
 
@@ -21,7 +21,7 @@ class PersonListAdapter(val list: List<Person>) : RecyclerView.Adapter<PersonLis
         holder.bind(person, this.clickListener)
     }
 
-    inner class PersonViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    inner class PersonViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         fun bind(item: Person, clicklistener: (Person) -> Unit) = with(itemView) {
             name.text = item.name
             phone.text = item.phone
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/data/PersonDao.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/data/PersonDao.kt
old mode 100644
new mode 100755
index ee48aa0..476f805
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/data/PersonDao.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/data/PersonDao.kt
@@ -1,9 +1,9 @@
 package com.levimoreira.teammenagerapp.person.data
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy.REPLACE
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy.REPLACE
+import androidx.room.Query
 import com.levimoreira.teammenagerapp.application.entities.Person
 import io.reactivex.Maybe
 import io.reactivex.Single
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/data/PersonRepository.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/data/PersonRepository.kt
old mode 100644
new mode 100755
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/di/PersonModule.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/di/PersonModule.kt
old mode 100644
new mode 100755
index 285b1a5..a09b26f
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/di/PersonModule.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/di/PersonModule.kt
@@ -1,6 +1,6 @@
 package com.levimoreira.teammenagerapp.person.di
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.di.ViewModelKey
 import com.levimoreira.teammenagerapp.person.viewmodel.PersonItemViewModel
 import com.levimoreira.teammenagerapp.person.viewmodel.PersonListViewModel
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonAddFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonAddFragment.kt
old mode 100644
new mode 100755
index 05276b4..3285e62
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonAddFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonAddFragment.kt
@@ -1,20 +1,18 @@
 package com.levimoreira.teammenagerapp.person.view
 
-
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
-import android.util.Log
+import com.google.android.material.snackbar.Snackbar
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.navigation.Navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import com.levimoreira.teammenagerapp.R
+import com.levimoreira.teammenagerapp.application.entities.Address
 import com.levimoreira.teammenagerapp.application.entities.Person
 import com.levimoreira.teammenagerapp.person.viewmodel.PersonItemViewModel
 import dagger.android.support.DaggerFragment
@@ -34,7 +32,7 @@ class PersonAddFragment : DaggerFragment(), LifecycleOwner {
     lateinit var viewModel: PersonItemViewModel
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+        savedInstanceState: Bundle?): View? {
 
         viewModel = ViewModelProviders.of(this, viewModelFactory).get(PersonItemViewModel::class.java)
         // Inflate the layout for this fragment
@@ -46,9 +44,10 @@ class PersonAddFragment : DaggerFragment(), LifecycleOwner {
 
         createPersonButton.setOnClickListener {
             val person = Person(id = null,
-                    name = inputName.text.toString(),
-                    phone = inputPhone.text.toString(),
-                    email = inputEmail.text.toString())
+                name = inputName.text.toString(),
+                phone = inputPhone.text.toString(),
+                email = inputEmail.text.toString(),
+                address = Address("Ari Maian", "488"))
 
             viewModel.createPerson(person).observe(this, Observer {
                 this.view?.let { view ->
@@ -62,6 +61,4 @@ class PersonAddFragment : DaggerFragment(), LifecycleOwner {
     companion object {
         val TAG = "OrganizationAddFragment"
     }
-
-
 }
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonListFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonListFragment.kt
old mode 100644
new mode 100755
index d6a979c..0c5d260
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonListFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/view/PersonListFragment.kt
@@ -1,18 +1,19 @@
 package com.levimoreira.teammenagerapp.person.view
 
 
-import android.arch.lifecycle.LifecycleOwner
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProvider
-import android.arch.lifecycle.ViewModelProviders
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import android.content.Context
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.navigation.Navigation
 import androidx.navigation.findNavController
 import com.levimoreira.teammenagerapp.R
 import com.levimoreira.teammenagerapp.application.entities.Person
@@ -54,7 +55,8 @@ class PersonListFragment : DaggerFragment(), LifecycleOwner {
             Toast.makeText(this.context, person.name, Toast.LENGTH_SHORT).show()
         }
 
-        personRecyclerView.layoutManager = LinearLayoutManager(this.context)
+        personRecyclerView.layoutManager =
+            androidx.recyclerview.widget.LinearLayoutManager(this.context)
         personRecyclerView.adapter = adapter
 
 
@@ -62,6 +64,8 @@ class PersonListFragment : DaggerFragment(), LifecycleOwner {
             it.findNavController().navigate(R.id.action_personListFragment_to_personAddFragment)
             it.visibility = View.INVISIBLE
         }
+
+        addPerson.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_personListFragment_to_personAddFragment, null))
         viewModel.getAllPersons().observe(this, Observer {
             it?.let {
                 personList.clear()
@@ -71,8 +75,10 @@ class PersonListFragment : DaggerFragment(), LifecycleOwner {
         })
     }
 
+
     companion object {
         val TAG = "PersonListFragment"
+
     }
 
 }
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonItemViewModel.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonItemViewModel.kt
old mode 100644
new mode 100755
index 5fb720b..2ceb565
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonItemViewModel.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonItemViewModel.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.person.viewmodel
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.LiveDataReactiveStreams
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.LiveDataReactiveStreams
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.entities.Person
 import com.levimoreira.teammenagerapp.person.data.PersonRepository
 import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonListViewModel.kt b/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonListViewModel.kt
old mode 100644
new mode 100755
index b319832..2e436d1
--- a/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonListViewModel.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/person/viewmodel/PersonListViewModel.kt
@@ -1,8 +1,8 @@
 package com.levimoreira.teammenagerapp.person.viewmodel
 
-import android.arch.lifecycle.LiveData
-import android.arch.lifecycle.LiveDataReactiveStreams
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.LiveDataReactiveStreams
+import androidx.lifecycle.ViewModel
 import com.levimoreira.teammenagerapp.application.entities.Person
 import com.levimoreira.teammenagerapp.person.data.PersonRepository
 import io.reactivex.android.schedulers.AndroidSchedulers
diff --git a/app/src/main/java/com/levimoreira/teammenagerapp/task/TasksFragment.kt b/app/src/main/java/com/levimoreira/teammenagerapp/task/TasksFragment.kt
old mode 100644
new mode 100755
index 30d8316..fe73aa9
--- a/app/src/main/java/com/levimoreira/teammenagerapp/task/TasksFragment.kt
+++ b/app/src/main/java/com/levimoreira/teammenagerapp/task/TasksFragment.kt
@@ -2,7 +2,7 @@ package com.levimoreira.teammenagerapp.task
 
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,7 +13,7 @@ import com.levimoreira.teammenagerapp.R
  * A simple [Fragment] subclass.
  *
  */
-class TasksFragment : Fragment() {
+class TasksFragment : androidx.fragment.app.Fragment() {
     val TAG = "TasksFragment"
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
diff --git a/app/src/main/res/anim/enter_from_bottom.xml b/app/src/main/res/anim/enter_from_bottom.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/anim/exit_from_top.xml b/app/src/main/res/anim/exit_from_top.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_business.xml b/app/src/main/res/drawable/ic_business.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_dashboard.xml b/app/src/main/res/drawable/ic_dashboard.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/drawable/ic_organization.xml b/app/src/main/res/drawable/ic_organization.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/font/varela.xml b/app/src/main/res/font/varela.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
old mode 100644
new mode 100755
index bd078ff..b2e79b2
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".main.MainActivity">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:id="@+id/container"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent"
+                                                   tools:context=".main.MainActivity">
 
     <fragment
         android:id="@+id/my_nav_host_fragment"
@@ -19,7 +19,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:navGraph="@navigation/nav_graph" />
 
-    <android.support.design.widget.BottomNavigationView
+    <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/navigation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -31,4 +31,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:menu="@menu/navigation" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/business_item_view.xml b/app/src/main/res/layout/business_item_view.xml
old mode 100644
new mode 100755
index c3ee4f9..79a9b2e
--- a/app/src/main/res/layout/business_item_view.xml
+++ b/app/src/main/res/layout/business_item_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/title"
@@ -68,4 +68,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/description" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_organization.xml b/app/src/main/res/layout/fragment_add_organization.xml
old mode 100644
new mode 100755
index adf5ec4..338ceb0
--- a/app/src/main/res/layout/fragment_add_organization.xml
+++ b/app/src/main/res/layout/fragment_add_organization.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/mainView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".organization.views.OrganizationAddFragment">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:id="@+id/mainView"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent"
+                                                   tools:context=".organization.views.OrganizationAddFragment">
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/textInputName"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
         android:layout_width="0dp"
@@ -22,15 +22,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/inputName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/varela"
             android:inputType="text" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
 
         android:id="@+id/textInputPhone"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
@@ -44,15 +44,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textInputName">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/inputPhone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/varela"
             android:inputType="phone" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/textInputAddress"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
         android:layout_width="0dp"
@@ -65,15 +65,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textInputPhone">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/inputAddress"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/varela"
             android:inputType="text" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.button.MaterialButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/createOrganizationButton"
         style="@style/Widget.MaterialComponents.Button"
         android:layout_width="0dp"
@@ -87,4 +87,4 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textInputAddress" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_add_person.xml b/app/src/main/res/layout/fragment_add_person.xml
old mode 100644
new mode 100755
index 1a30201..31880d0
--- a/app/src/main/res/layout/fragment_add_person.xml
+++ b/app/src/main/res/layout/fragment_add_person.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/mainView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".organization.views.OrganizationAddFragment">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:id="@+id/mainView"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent"
+                                                   tools:context=".organization.views.OrganizationAddFragment">
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/textInputName"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
         android:layout_width="0dp"
@@ -22,15 +22,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/inputName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/varela"
             android:inputType="text" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
 
         android:id="@+id/textInputPhone"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
@@ -44,15 +44,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textInputName">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/inputPhone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/varela"
             android:inputType="phone" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/textInputEmail"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
         android:layout_width="0dp"
@@ -65,15 +65,15 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textInputPhone">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/inputEmail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/varela"
             android:inputType="textEmailAddress" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.button.MaterialButton
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/createPersonButton"
         style="@style/Widget.MaterialComponents.Button"
         android:layout_width="0dp"
@@ -87,4 +87,4 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textInputEmail" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_business.xml b/app/src/main/res/layout/fragment_business.xml
old mode 100644
new mode 100755
index c6df5a3..345866b
--- a/app/src/main/res/layout/fragment_business.xml
+++ b/app/src/main/res/layout/fragment_business.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".organization.views.OrganizationListFragment">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent"
+                                                   tools:context=".organization.views.OrganizationListFragment">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/businessRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -16,7 +16,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/person_item_view" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addBusiness"
         android:layout_width="56dp"
         android:layout_height="56dp"
@@ -27,4 +27,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_business_add.xml b/app/src/main/res/layout/fragment_business_add.xml
old mode 100644
new mode 100755
index f9c7ed4..e8eb477
--- a/app/src/main/res/layout/fragment_business_add.xml
+++ b/app/src/main/res/layout/fragment_business_add.xml
@@ -7,14 +7,14 @@
     android:fillViewport="true"
     android:layout_height="match_parent">
 
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        tools:context=".business.views.BusinessAddFragment">
-
-        <android.support.design.widget.TextInputLayout
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                       xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                       xmlns:tools="http://schemas.android.com/tools"
+                                                       android:layout_width="match_parent"
+                                                       android:layout_height="wrap_content"
+                                                       tools:context=".business.views.BusinessAddFragment">
+
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textInputTitle"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
             android:layout_width="0dp"
@@ -27,15 +27,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputTitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/varela"
                 android:inputType="text" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textInputDescription"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
             android:layout_width="0dp"
@@ -48,13 +48,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textInputTitle">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/varela"
                 android:inputType="text" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
         <Spinner
             android:id="@+id/organizationSpinner"
@@ -78,7 +78,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/organizationSpinner" />
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textInputValue"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
             android:layout_width="0dp"
@@ -91,15 +91,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/personSpinner">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputValue"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/varela"
                 android:inputType="text" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textInputDeadline"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
             android:layout_width="0dp"
@@ -112,15 +112,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textInputValue">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputDeadline"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/varela"
                 android:inputType="text" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/textInputState"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlineBox"
             android:layout_width="0dp"
@@ -133,15 +133,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textInputDeadline">
 
-            <android.support.design.widget.TextInputEditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/inputState"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/varela"
                 android:inputType="text" />
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <android.support.design.button.MaterialButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/createBusinessButton"
             style="@style/Widget.MaterialComponents.Button"
             android:layout_width="0dp"
@@ -156,5 +156,5 @@
             app:layout_constraintTop_toBottomOf="@+id/textInputState" />
 
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/fragment_organization.xml b/app/src/main/res/layout/fragment_organization.xml
old mode 100644
new mode 100755
index 88e0a0f..701f58a
--- a/app/src/main/res/layout/fragment_organization.xml
+++ b/app/src/main/res/layout/fragment_organization.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".organization.views.OrganizationListFragment">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent"
+                                                   tools:context=".organization.views.OrganizationListFragment">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/organizationRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -16,7 +16,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/person_item_view" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addOrganization"
         android:layout_width="56dp"
         android:layout_height="56dp"
@@ -27,4 +27,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_people.xml b/app/src/main/res/layout/fragment_people.xml
old mode 100644
new mode 100755
index b63b6ed..b7305c4
--- a/app/src/main/res/layout/fragment_people.xml
+++ b/app/src/main/res/layout/fragment_people.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".organization.views.OrganizationListFragment">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   xmlns:tools="http://schemas.android.com/tools"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="match_parent"
+                                                   tools:context=".organization.views.OrganizationListFragment">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/personRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -16,7 +16,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:listitem="@layout/person_item_view" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/addPerson"
         android:layout_width="56dp"
         android:layout_height="56dp"
@@ -27,4 +27,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tasks.xml b/app/src/main/res/layout/fragment_tasks.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/layout/organization_item_view.xml b/app/src/main/res/layout/organization_item_view.xml
old mode 100644
new mode 100755
index 12424ee..be9d7d9
--- a/app/src/main/res/layout/organization_item_view.xml
+++ b/app/src/main/res/layout/organization_item_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/name"
@@ -42,4 +42,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/organization_spinner_list.xml b/app/src/main/res/layout/organization_spinner_list.xml
old mode 100644
new mode 100755
index 255d97b..85d877d
--- a/app/src/main/res/layout/organization_spinner_list.xml
+++ b/app/src/main/res/layout/organization_spinner_list.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/organizationName"
@@ -17,4 +17,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_item_view.xml b/app/src/main/res/layout/person_item_view.xml
old mode 100644
new mode 100755
index 637d890..ce13b0c
--- a/app/src/main/res/layout/person_item_view.xml
+++ b/app/src/main/res/layout/person_item_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/name"
@@ -42,4 +42,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/person_spinner_list.xml b/app/src/main/res/layout/person_spinner_list.xml
old mode 100644
new mode 100755
index 698a77d..1283b45
--- a/app/src/main/res/layout/person_spinner_list.xml
+++ b/app/src/main/res/layout/person_spinner_list.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/personName"
@@ -17,4 +17,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
old mode 100644
new mode 100755
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
old mode 100644
new mode 100755
index 1d0d8fd..99f54d1
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -2,7 +2,7 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    app:startDestination="@id/navigation_home">
+    app:startDestination="@+id/navigation_home">
 
     <fragment
         android:id="@+id/navigation_home"
@@ -17,7 +17,7 @@
     <fragment
         android:id="@+id/businessAddFragment"
         android:name="com.levimoreira.teammenagerapp.business.views.BusinessAddFragment"
-        android:label="@string/add_business" />
+        android:label="@string/add_business" ></fragment>
     <fragment
         android:id="@+id/navigation_organization"
         android:name="com.levimoreira.teammenagerapp.organization.views.OrganizationListFragment"
@@ -28,6 +28,7 @@
             app:destination="@id/organizationAddFragment"
             app:enterAnim="@anim/enter_from_bottom"
             app:exitAnim="@anim/exit_from_top"
+            app:launchSingleTop="false"
             app:popUpTo="@+id/navigation_organization" />
     </fragment>
     <fragment
@@ -40,6 +41,10 @@
             app:enterAnim="@anim/enter_from_bottom"
             app:exitAnim="@anim/exit_from_top"
             app:popUpTo="@+id/navigation_business" />
+        <argument
+            android:name="arg1"
+            android:defaultValue="0"
+            app:argType="string" />
     </fragment>
     <fragment
         android:id="@+id/navigation_people"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
old mode 100644
new mode 100755
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
old mode 100644
new mode 100755
diff --git a/app/src/test/java/com/levimoreira/teammenagerapp/ExampleUnitTest.kt b/app/src/test/java/com/levimoreira/teammenagerapp/ExampleUnitTest.kt
old mode 100644
new mode 100755
diff --git a/build.gradle b/build.gradle
old mode 100644
new mode 100755
index 3e06d52..ed0bee3
--- a/build.gradle
+++ b/build.gradle
@@ -1,27 +1,24 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.kotlin_version = '1.2.41'
+    ext.kotlin_version = '1.3.21'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0-alpha16'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
+        classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-rc01"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
-
 allprojects {
     repositories {
         google()
         jcenter()
     }
 }
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
diff --git a/gradle.properties b/gradle.properties
old mode 100644
new mode 100755
index 743d692..8de5058
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
old mode 100644
new mode 100755
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
old mode 100644
new mode 100755
index bb5485f..1eb61b4
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 30 17:05:11 BRT 2018
+#Mon Feb 25 00:37:27 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/gradlew.bat b/gradlew.bat
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
old mode 100644
new mode 100755