diff --git a/components/nvidia-widgets/examples/example.lpi b/components/nvidia-widgets/examples/example.lpi
index 922facf49..a1227d25b 100644
--- a/components/nvidia-widgets/examples/example.lpi
+++ b/components/nvidia-widgets/examples/example.lpi
@@ -13,7 +13,7 @@
       <MainUnit Value="0"/>
       <ResourceType Value="res"/>
     </General>
-    <LazDoc Paths="..\..\..\doc"/>
+    <LazDoc Paths="..\doc"/>
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
@@ -40,27 +40,27 @@
         <UnitName Value="example"/>
       </Unit0>
       <Unit1>
-        <Filename Value="..\nvglwidgets.pas"/>
+        <Filename Value="..\src\nvglwidgets.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="nvGLWidgets"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\..\nvglutils\nvShaderUtils.pas"/>
+        <Filename Value="..\src\gl\nvShaderUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="nvShaderUtils"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\nvWidgets.pas"/>
+        <Filename Value="..\src\nvWidgets.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="nvWidgets"/>
       </Unit3>
       <Unit4>
-        <Filename Value="..\nvglutwidgets.pas"/>
+        <Filename Value="..\src\glut\nvglutwidgets.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="nvGlutWidgets"/>
       </Unit4>
       <Unit5>
-        <Filename Value="..\..\gl\glfreetype.pas"/>
+        <Filename Value="..\src\gl\glfreetype.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="GLFreeType"/>
       </Unit5>
@@ -74,7 +74,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..;..\..\nvglutils;..\..\gl"/>
+      <OtherUnitFiles Value="..\src;..\src\gl;..\src\glut"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
diff --git a/components/nvidia-widgets/examples/widget_test.lpi b/components/nvidia-widgets/examples/widget_test.lpi
index 07cc6e1bb..35add7da3 100644
--- a/components/nvidia-widgets/examples/widget_test.lpi
+++ b/components/nvidia-widgets/examples/widget_test.lpi
@@ -14,7 +14,7 @@
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
     </General>
-    <LazDoc Paths="..\..\..\doc"/>
+    <LazDoc Paths="..\doc"/>
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
@@ -41,7 +41,7 @@
         <UnitName Value="widget_test"/>
       </Unit0>
       <Unit1>
-        <Filename Value="..\nvWidgets.pas"/>
+        <Filename Value="..\src\nvWidgets.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="nvWidgets"/>
       </Unit1>
@@ -55,7 +55,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\..\nvglutils;.."/>
+      <OtherUnitFiles Value="..\src\;..\src\gl\;..\src\glut\"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Other>
diff --git a/components/nvidia-widgets/src/fpmake.pp b/components/nvidia-widgets/src/fpmake.pp
index 0e3fa1e87..adba63a38 100644
--- a/components/nvidia-widgets/src/fpmake.pp
+++ b/components/nvidia-widgets/src/fpmake.pp
@@ -30,8 +30,8 @@ begin
         P.Options.Add(NV_PROFILE_FLAGS[i]);
 	  
     //base widget units
-    P.Targets.AddUnit('./nvwidgets/nvbasefont.pas');
-    P.Targets.AddUnit('./nvwidgets/nvwidgets.pas');
+    P.Targets.AddUnit('nvbasefont.pas');
+    P.Targets.AddUnit('nvwidgets.pas');
 
 	write('package ', P.Name, ' configured for ');
 
@@ -39,7 +39,7 @@ begin
     case NV_ACTIVE_CONTEXT of
 	  GLUT: begin
 	          write('the GLUT context');
-	          P.Targets.AddUnit('./nvwidgets/nvglutwidgets.pas');	
+	          P.Targets.AddUnit('./glut/nvglutwidgets.pas');	
 			end;
 	end;
 	
diff --git a/components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas b/components/nvidia-widgets/src/gl/nvShaderUtils.pas
similarity index 100%
rename from components/nvidia-widgets/src/nvglutils/nvShaderUtils.pas
rename to components/nvidia-widgets/src/gl/nvShaderUtils.pas
diff --git a/components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas b/components/nvidia-widgets/src/gl/nvglwidgets.pas
similarity index 100%
rename from components/nvidia-widgets/src/nvwidgets/nvglwidgets.pas
rename to components/nvidia-widgets/src/gl/nvglwidgets.pas
diff --git a/components/nvidia-widgets/src/nvwidgets/nvglutwidgets.pas b/components/nvidia-widgets/src/glut/nvglutwidgets.pas
similarity index 100%
rename from components/nvidia-widgets/src/nvwidgets/nvglutwidgets.pas
rename to components/nvidia-widgets/src/glut/nvglutwidgets.pas
diff --git a/components/nvidia-widgets/src/nvwidgets/nvbasefont.pas b/components/nvidia-widgets/src/nvbasefont.pas
similarity index 100%
rename from components/nvidia-widgets/src/nvwidgets/nvbasefont.pas
rename to components/nvidia-widgets/src/nvbasefont.pas
diff --git a/components/nvidia-widgets/src/nvwidgets/nvwidgets.pas b/components/nvidia-widgets/src/nvwidgets.pas
similarity index 100%
rename from components/nvidia-widgets/src/nvwidgets/nvwidgets.pas
rename to components/nvidia-widgets/src/nvwidgets.pas