diff --git a/Main.dfm b/MainView.dfm
similarity index 98%
rename from Main.dfm
rename to MainView.dfm
index 25bc756..e3eab42 100644
--- a/Main.dfm
+++ b/MainView.dfm
@@ -1,4 +1,4 @@
-object MainForm: TMainForm
+object MainViewForm: TMainViewForm
   Left = 0
   Top = 0
   Caption = 'SimpleMVVMDemo'
diff --git a/MainView.pas b/MainView.pas
new file mode 100644
index 0000000..92b9348
--- /dev/null
+++ b/MainView.pas
@@ -0,0 +1,64 @@
+unit MainView;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, StdCtrls, SimpleMVVM.Binding;
+
+type
+  TMainViewForm = class(TForm)
+
+    GroupBox1: TGroupBox;
+    [Bind('Value', 'FirstName')]
+    edtFirstName: TEdit;
+    [Bind('Value', 'LastName')]
+    edtLastName: TEdit;
+    [Bind('Text', 'FullName')]
+    lblFullName: TLabel;
+
+    GroupBox2: TGroupBox;
+    [Bind('Click', 'RegisterClick')]
+    [Bind('Disabled', 'HasClickedTooManyTimes')]
+    btnRegisterClick: TButton;
+    [Bind('Text', 'NumberOfClicks')]
+    lblClickCount: TLabel;
+    [Bind('Click', 'ResetClicks')]
+    [Bind('Visible', 'HasClickedTooManyTimes')]
+    btnResetClicks: TButton;
+    [Bind('Visible', 'HasClickedTooManyTimes')]
+    lblClickedTooManyTimes: TLabel;
+
+    GroupBox3: TGroupBox;
+    [Bind('Value', 'ChosenTicket')]
+    [BindOptions('Tickets')]
+    [BindOptionsCaption('Choose...')]
+    [BindOptionsText('Name')]
+    cbTickets: TComboBox;
+    [Bind('Text', 'ChosenTicket.Price')]
+    lblPrice: TLabel;
+    [Bind('Click', 'ResetTicket')]
+    [Bind('Enabled', 'ChosenTicket')]
+    btnClear: TButton;
+
+    procedure FormCreate(Sender: TObject);
+  end;
+
+var
+  MainViewForm: TMainViewForm;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  MainViewModel;
+
+{ TMainForm }
+
+procedure TMainViewForm.FormCreate(Sender: TObject);
+begin
+  ApplyBindings(Self, TViewModel.Create('John', 'Doe'));
+end;
+
+end.
diff --git a/Main.pas b/MainViewModel.pas
similarity index 68%
rename from Main.pas
rename to MainViewModel.pas
index 40cc130..0172212 100644
--- a/Main.pas
+++ b/MainViewModel.pas
@@ -1,57 +1,9 @@
-unit Main;
+unit MainViewModel;
 
 interface
 
 uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, SimpleMVVM.Binding;
-
-type
-  TMainForm = class(TForm)
-
-    GroupBox1: TGroupBox;
-    [Bind('Value', 'FirstName')]
-    edtFirstName: TEdit;
-    [Bind('Value', 'LastName')]
-    edtLastName: TEdit;
-    [Bind('Text', 'FullName')]
-    lblFullName: TLabel;
-
-    GroupBox2: TGroupBox;
-    [Bind('Click', 'RegisterClick')]
-    [Bind('Disabled', 'HasClickedTooManyTimes')]
-    btnRegisterClick: TButton;
-    [Bind('Text', 'NumberOfClicks')]
-    lblClickCount: TLabel;
-    [Bind('Click', 'ResetClicks')]
-    [Bind('Visible', 'HasClickedTooManyTimes')]
-    btnResetClicks: TButton;
-    [Bind('Visible', 'HasClickedTooManyTimes')]
-    lblClickedTooManyTimes: TLabel;
-
-    GroupBox3: TGroupBox;
-    [Bind('Value', 'ChosenTicket')]
-    [BindOptions('Tickets')]
-    [BindOptionsCaption('Choose...')]
-    [BindOptionsText('Name')]
-    cbTickets: TComboBox;
-    [Bind('Text', 'ChosenTicket.Price')]
-    lblPrice: TLabel;
-    [Bind('Click', 'ResetTicket')]
-    [Bind('Enabled', 'ChosenTicket')]
-    btnClear: TButton;
-
-    procedure FormCreate(Sender: TObject);
-  end;
-
-var
-  MainForm: TMainForm;
-
-implementation
-
-{$R *.dfm}
-
-uses
+  Classes,
   Generics.Collections,
   SimpleMVVM.Observable;
 
@@ -98,6 +50,8 @@   TViewModel = class(TComponent)
     property Tickets: TList<TTicket> read fTickets;
   end;
 
+implementation
+
 { TTicket }
 
 constructor TTicket.Create(const name: string; price: Currency);
@@ -169,11 +123,4 @@ procedure TViewModel.SetLastName(const value: string);
   fLastName.Value := value;
 end;
 
-{ TMainForm }
-
-procedure TMainForm.FormCreate(Sender: TObject);
-begin
-  ApplyBindings(Self, TViewModel.Create('John', 'Doe'));
-end;
-
 end.
diff --git a/SimpleMVVM.Binding.pas b/SimpleMVVM.Binding.pas
index ecd8664..f6201c0 100644
--- a/SimpleMVVM.Binding.pas
+++ b/SimpleMVVM.Binding.pas
@@ -67,7 +67,7 @@ procedure ApplyBindings(const view: TComponent; const viewModel: TObject);
   f: TRttiField;
   a: TCustomAttribute;
 begin
-  if (viewModel is TComponent) then
+  if viewModel is TComponent then
     if TComponent(viewModel).Owner = nil then
       view.InsertComponent(TComponent(viewModel));
 
diff --git a/SimpleMVVMDemo.dpr b/SimpleMVVMDemo.dpr
index 706e918..d790465 100644
--- a/SimpleMVVMDemo.dpr
+++ b/SimpleMVVMDemo.dpr
@@ -2,16 +2,15 @@ program SimpleMVVMDemo;
 
 uses
   Forms,
-  Main in 'Main.pas' {MainForm},
-  SimpleMVVM.Binding in 'SimpleMVVM.Binding.pas',
-  SimpleMVVM.Binding.Components in 'SimpleMVVM.Binding.Components.pas';
+  MainView in 'MainView.pas' {MainViewForm},
+  MainViewModel in 'MainViewModel.pas';
 
 {$R *.res}
 
 begin
   Application.Initialize;
   Application.MainFormOnTaskbar := True;
-  Application.CreateForm(TMainForm, MainForm);
+  Application.CreateForm(TMainViewForm, MainViewForm);
   Application.Run;
   ReportMemoryLeaksOnShutdown := True;
 end.
diff --git a/SimpleMVVMDemo.dproj b/SimpleMVVMDemo.dproj
index 9613859..c48d69a 100644
--- a/SimpleMVVMDemo.dproj
+++ b/SimpleMVVMDemo.dproj
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <ProjectGuid>{49FC422F-A839-4326-8632-DDD0661BF466}</ProjectGuid>
-        <ProjectVersion>16.1</ProjectVersion>
+        <ProjectVersion>17.1</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <MainSource>SimpleMVVMDemo.dpr</MainSource>
         <Base>True</Base>
@@ -13,6 +13,16 @@
     <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='iOSDevice32' and '$(Base)'=='true') or '$(Base_iOSDevice32)'!=''">
+        <Base_iOSDevice32>true</Base_iOSDevice32>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Base)'=='true') or '$(Base_iOSDevice64)'!=''">
+        <Base_iOSDevice64>true</Base_iOSDevice64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
         <Base_Win32>true</Base_Win32>
         <CfgParent>Base</CfgParent>
@@ -51,6 +61,20 @@
         <DCC_F>false</DCC_F>
         <DCC_K>false</DCC_K>
     </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_iOSDevice32)'!=''">
+        <BT_BuildType>Debug</BT_BuildType>
+        <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId>
+        <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone &amp; iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_iOSDevice64)'!=''">
+        <BT_BuildType>Debug</BT_BuildType>
+        <VerInfo_BundleId>$(MSBuildProjectName)</VerInfo_BundleId>
+        <VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone &amp; iPad;CFBundleResourceSpecification=ResourceRules.plist;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;FMLocalNotificationPermission=false</VerInfo_Keys>
+        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -83,12 +107,11 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Main.pas">
-            <Form>MainForm</Form>
+        <DCCReference Include="MainView.pas">
+            <Form>MainViewForm</Form>
             <FormType>dfm</FormType>
         </DCCReference>
-        <DCCReference Include="SimpleMVVM.Binding.pas"/>
-        <DCCReference Include="SimpleMVVM.Binding.Components.pas"/>
+        <DCCReference Include="MainViewModel.pas"/>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>
@@ -110,7 +133,7 @@
                     <Source Name="MainSource">SimpleMVVMDemo.dpr</Source>
                 </Source>
             </Delphi.Personality>
-            <Deployment>
+            <Deployment Version="1">
                 <DeployFile LocalName="Win32\Debug\SimpleMVVMDemo.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>SimpleMVVMDemo.exe</RemoteName>
@@ -118,7 +141,7 @@
                     </Platform>
                 </DeployFile>
                 <DeployClass Required="true" Name="DependencyPackage">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                         <Extensions>.dylib</Extensions>
                     </Platform>
@@ -135,9 +158,13 @@
                         <Operation>1</Operation>
                         <Extensions>.dylib</Extensions>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="DependencyModule">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                         <Extensions>.dylib</Extensions>
                     </Platform>
@@ -154,14 +181,21 @@
                         <Operation>1</Operation>
                         <Extensions>.dylib</Extensions>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="iPad_Launch2048">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXInfoPList">
                     <Platform Name="OSX32">
@@ -170,7 +204,11 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
                         <RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
@@ -188,12 +226,15 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSResource">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectOSXEntitlements">
                     <Platform Name="OSX32">
@@ -208,12 +249,15 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="iPhone_Launch640">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_SplashImage960">
                     <Platform Name="Android">
@@ -228,12 +272,15 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="iPhone_Launch320">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_LauncherIcon144">
                     <Platform Name="Android">
@@ -282,7 +329,11 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSEntitlements">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
+                        <RemoteDir>../</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
                         <RemoteDir>../</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
@@ -307,20 +358,26 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSInfoPList">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="iPad_Launch1024">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_DefaultAppIcon">
                     <Platform Name="Android">
@@ -335,26 +392,32 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceResourceRules">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
+                    <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="iPad_Launch768">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
-                </DeployClass>
-                <DeployClass Required="true" Name="ProjectOutput">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice32">
                         <Operation>1</Operation>
                     </Platform>
+                </DeployClass>
+                <DeployClass Required="true" Name="ProjectOutput">
                     <Platform Name="Android">
                         <RemoteDir>library\lib\armeabi-v7a</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice64">
+                        <Operation>1</Operation>
+                    </Platform>
                     <Platform Name="Win32">
                         <Operation>0</Operation>
                     </Platform>
@@ -365,6 +428,9 @@
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="AndroidLibnativeArmeabiFile">
                     <Platform Name="Android">
@@ -379,10 +445,10 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="File">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="Android">
                         <Operation>0</Operation>
                     </Platform>
-                    <Platform Name="Android">
+                    <Platform Name="iOSDevice64">
                         <Operation>0</Operation>
                     </Platform>
                     <Platform Name="Win32">
@@ -395,14 +461,20 @@
                     <Platform Name="iOSSimulator">
                         <Operation>0</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>0</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="iPhone_Launch640x1136">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_LauncherIcon36">
                     <Platform Name="Android">
@@ -417,12 +489,15 @@
                     </Platform>
                 </DeployClass>
                 <DeployClass Name="iPad_Launch1536">
-                    <Platform Name="iOSDevice">
+                    <Platform Name="iOSDevice64">
                         <Operation>1</Operation>
                     </Platform>
                     <Platform Name="iOSSimulator">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="iOSDevice32">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="Android_LauncherIcon48">
                     <Platform Name="Android">
@@ -441,14 +516,17 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
+                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="iOSDevice" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
             </Deployment>
             <Platforms>
+                <Platform value="iOSDevice32">False</Platform>
+                <Platform value="iOSDevice64">False</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">False</Platform>
             </Platforms>