diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/AccordionBindableLayout.Android.csproj b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/AccordionBindableLayout.Android.csproj
index ef05654..7d042fd 100644
--- a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/AccordionBindableLayout.Android.csproj
+++ b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/AccordionBindableLayout.Android.csproj
@@ -16,7 +16,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -50,20 +50,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Syncfusion.Xamarin.Expander">
-      <Version>17.1.0.51</Version>
+      <Version>18.4.0.34</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.425677" />
-    <PackageReference Include="Xamarin.Android.Support.Annotations">
-      <Version>28.0.0.1</Version>
+    <PackageReference Include="Xamarin.Forms">
+      <Version>4.5.0.617</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Android.Support.Compat">
-      <Version>28.0.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.1" />
-    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/Properties/AndroidManifest.xml b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/Properties/AndroidManifest.xml
index 9221a9f..7230e2d 100644
--- a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/Properties/AndroidManifest.xml
+++ b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.AccordionBindableLayout" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
 	<application android:label="AccordionBindableLayout.Android"></application>
 </manifest>
\ No newline at end of file
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.UWP/AccordionBindableLayout.UWP.csproj b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.UWP/AccordionBindableLayout.UWP.csproj
index 28003ca..a446125 100644
--- a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.UWP/AccordionBindableLayout.UWP.csproj
+++ b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.UWP/AccordionBindableLayout.UWP.csproj
@@ -11,8 +11,8 @@
     <AssemblyName>AccordionBindableLayout.UWP</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
@@ -144,10 +144,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Syncfusion.Xamarin.Expander">
-      <Version>17.1.0.51</Version>
+      <Version>18.4.0.34</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.5" />
+    <PackageReference Include="Xamarin.Forms">
+      <Version>4.5.0.617</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AccordionBindableLayout\AccordionBindableLayout.csproj">
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.iOS/AccordionBindableLayout.iOS.csproj b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.iOS/AccordionBindableLayout.iOS.csproj
index a3ea7e6..2f0a94a 100644
--- a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.iOS/AccordionBindableLayout.iOS.csproj
+++ b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.iOS/AccordionBindableLayout.iOS.csproj
@@ -151,9 +151,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Syncfusion.Xamarin.Expander">
-      <Version>17.1.0.51</Version>
+      <Version>18.4.0.34</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.Forms">
+      <Version>4.5.0.617</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.csproj b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.csproj
index c27c39d..91dca11 100644
--- a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.csproj
+++ b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Syncfusion.Xamarin.Expander" Version="17.1.0.51" />
-    <PackageReference Include="Xamarin.Forms" Version="4.0.0.540366" />
+    <PackageReference Include="Syncfusion.Xamarin.Expander" Version="18.4.0.34" />
+    <PackageReference Include="Xamarin.Forms" Version="4.5.0.617" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/ViewModel.cs b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/ViewModel/ViewModel.cs
similarity index 100%
rename from AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/ViewModel.cs
rename to AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/ViewModel/ViewModel.cs
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/MainPage.xaml b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/Views/MainPage.xaml
similarity index 100%
rename from AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/MainPage.xaml
rename to AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/Views/MainPage.xaml
diff --git a/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/MainPage.xaml.cs b/AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/Views/MainPage.xaml.cs
similarity index 100%
rename from AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/MainPage.xaml.cs
rename to AccordionBindableLayout/AccordionBindableLayout/AccordionBindableLayout/Views/MainPage.xaml.cs