--- a/uh_parser/RaptorUnreciped.pm	Tue Jun 22 10:59:48 2010 +0100
+++ b/uh_parser/RaptorUnreciped.pm	Mon Jun 28 11:59:20 2010 +0100
@@ -178,16 +178,10 @@
 		{
 			$::allbldinfs->{$guessed_bldinf} = 1;
 			
-			# normalize bldinf path
-			$guessed_bldinf = lc($guessed_bldinf);
-			$guessed_bldinf =~ s,^[A-Za-z]:,,;
-			$guessed_bldinf =~ s,[\\],/,g;
+			RaptorCommon::normalize_bldinf_path(\$guessed_bldinf);
 			
-			if ($guessed_bldinf =~ m,/((os|mw|app|tools|ostools|adaptation)/[a-zA-Z]+),)
-			{
-				$package = $1;
-				$package =~ s,/,_,;
-			}
+			$package = RaptorCommon::get_package_subpath($guessed_bldinf);
+			$package =~ s,/,_,g;
 		}
 			
 		if ($line =~ m,[^\s^\r^\n],)