diff --git a/vtk.spec b/vtk.spec
index 4d81a9c..1598179 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -174,26 +174,34 @@ find $RPM_BUILD_ROOT%{_datadir}/%{name}-examples	\
 find $RPM_BUILD_ROOT%{_datadir}/%{name}-examples	\
 	-name "CMake*" | xargs rm -rf
 
-# cmake, testing
-install -d $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/CMake
-install -d $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/testing
-
+# cmake
+install -d $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
 mv $RPM_BUILD_ROOT/%{_libdir}/*.cmake $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-mv $RPM_BUILD_ROOT/%{_libdir}/CMake/* $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}/CMake
+mv $RPM_BUILD_ROOT/%{_libdir}/CMake $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
 mv $RPM_BUILD_ROOT/%{_libdir}/hints $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-#mv $RPM_BUILD_ROOT/%{_libdir}/pkgIndex.tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-#mv $RPM_BUILD_ROOT/%{_libdir}/testing $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-#mv $RPM_BUILD_ROOT/%{_libdir}/tcl $RPM_BUILD_ROOT/%{_libdir}/vtk-%{lib_ver}
-
-# remove doxygen scripts and 
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/doxygen
-rm -rf $RPM_BUILD_ROOT/%{_libdir}/doc
 
 # make scripts executable
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/testing/*.{py,tcl}
 
+# fix tcl stuff
+install -d $RPM_BUILD_ROOT/usr/share/tcl/vtk-%{lib_ver}/testing
+mv $RPM_BUILD_ROOT/%{_libdir}/pkgIndex.tcl $RPM_BUILD_ROOT/usr/share/tcl/vtk-%{lib_ver}
+mv $RPM_BUILD_ROOT/%{_libdir}/tcl/* $RPM_BUILD_ROOT/usr/share/tcl/vtk-%{lib_ver}
+mv $RPM_BUILD_ROOT/%{_libdir}/testing/*.tcl $RPM_BUILD_ROOT/usr/share/tcl/vtk-%{lib_ver}/testing
+
+#python testing files ???
+install -d $RPM_BUILD_ROOT/%{_docdir}/vtk-python/examples
+mv $RPM_BUILD_ROOT/%{_libdir}/testing/*.py $RPM_BUILD_ROOT/%{_docdir}/vtk-python/examples
+
+# remove doxygen scripts and verdict docs
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/doxygen
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/doc
+
 # Remove exec bit from not-scripts
-for file in `find $RPM_BUILD_ROOT Utilities/Upgrading -type f -perm 0755 | xargs -r file  | grep ASCII | awk -F: '{print $1}'`; do
+chmod 0644 Utilities/Upgrading/*.pdf
+chmod 0644 Utilities/Upgrading/*.txt
+
+for file in `find $RPM_BUILD_ROOT -type f -perm 0755 | xargs -r file  | grep ASCII | awk -F: '{print $1}'`; do
   head -1 $file | grep '^#!' > /dev/null && continue
   chmod 0644 $file
 done
@@ -205,7 +213,7 @@ find $RPM_BUILD_ROOT -size 0 | xargs rm -f
 chrpath -d $RPM_BUILD_ROOT%{_bindir}/*
 
 # make doc-dirs
-for dir in vtk vtk-devel vtk-tcl vtk-testing-progs ; do
+for dir in vtk vtk-devel vtk-tcl vtk-testing-progs vtk-python; do
         install -d $RPM_BUILD_ROOT/%{_docdir}/"$dir"
 done
 
@@ -303,28 +311,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tcl
 %defattr(-,root,root,-)
-%dir %{_libdir}/testing
 %{_bindir}/vtkWrapTcl
 %{_bindir}/vtkWrapTclInit
-%{_libdir}/libvtk*TCL.so.*
 %{_bindir}/vtk
-%{_libdir}/tcl
-%{_libdir}/testing/*.tcl
-%{_libdir}/pkgIndex.tcl
+%{_libdir}/libvtk*TCL.so.*
+%{_datadir}/tcl
 
 %doc README.html 
 %doc vtkLogo.jpg
 
 %files python
 %defattr(-,root,root,-)
-%dir %{_libdir}/testing
 %{_bindir}/vtkWrapPython
 %{_bindir}/vtkWrapPythonInit
 %{_bindir}/vtkpython
 %{_libdir}/libvtk*Python*.so.*
 %{py_sitedir}/*
-%{_libdir}/testing/*.py
-
+%doc README.html 
+%doc vtkLogo.jpg
+%doc %{_docdir}/vtk-python
 
 %files qt
 %defattr(-,root,root,-)