Index: VerpakkingsDefinitie/VerpakkingsDefinitie.dproj
===================================================================
diff -u -r533 -r547
--- VerpakkingsDefinitie/VerpakkingsDefinitie.dproj	(.../VerpakkingsDefinitie.dproj)	(revision 533)
+++ VerpakkingsDefinitie/VerpakkingsDefinitie.dproj	(.../VerpakkingsDefinitie.dproj)	(revision 547)
@@ -70,6 +70,8 @@
 			<DCC_RemoteDebug>true</DCC_RemoteDebug>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<VerInfo_Locale>1033</VerInfo_Locale>
 			<DCC_RemoteDebug>false</DCC_RemoteDebug>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2)'!=''">
@@ -82,17 +84,21 @@
 			<DelphiCompile Include="$(MainSource)">
 				<MainSource>MainSource</MainSource>
 			</DelphiCompile>
-			<DCCReference Include="Unit1.pas">
+			<DCCReference Include="Main.pas">
+				<Form>FormMain</Form>
+			</DCCReference>
+			<DCCReference Include="ApplicationContext.pas"/>
+			<DCCReference Include="UI\Unit1.pas">
 				<Form>Form1</Form>
-				<FormType>dfm</FormType>
 			</DCCReference>
-			<DCCReference Include="GebruikerService.pas"/>
-			<DCCReference Include="LogInScherm.pas">
-				<Form>fmLogin</Form>
-				<FormType>dfm</FormType>
+			<DCCReference Include="WS\GebruikerService.pas"/>
+			<DCCReference Include="UI\LoginScherm.pas">
+				<Form>FormLogin</Form>
 			</DCCReference>
-			<DCCReference Include="UserServerService.pas"/>
-			<DCCReference Include="Agent.pas"/>
+			<DCCReference Include="WS\UserServerService.pas"/>
+			<DCCReference Include="WS\Agent.pas"/>
+			<DCCReference Include="UI\UIContext.pas"/>
+			<DCCReference Include="UI\Subscherm.pas"/>
 			<BuildConfiguration Include="Release">
 				<Key>Cfg_2</Key>
 				<CfgParent>Base</CfgParent>
@@ -140,6 +146,10 @@
 					<Source>
 						<Source Name="MainSource">VerpakkingsDefinitie.dpr</Source>
 					</Source>
+					<Excluded_Packages>
+						<Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+						<Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+					</Excluded_Packages>
 				</Delphi.Personality>
 				<Deployment/>
 				<Platforms>