--- a/debian/rules	Mon Oct 10 13:19:05 2011 +0200
+++ b/debian/rules	Fri Oct 14 12:19:10 2011 +0200
@@ -25,20 +25,31 @@
 	   }
 
 	# move logs and data to var/
+	@mv ${core}/usr/share/littlebird-tc/CA ${core}/var/lib/littlebird-tc
 	@mv ${core}/usr/share/littlebird-tc/TrustCenter/data/logs ${core}/var/log/littlebird-tc 
-	@mv ${core}/usr/share/littlebird-tc/TrustCenter/data/* ${core}/var/lib/littlebird-tc/
+	@mv ${core}/usr/share/littlebird-tc/TrustCenter/data ${core}/var/lib/littlebird-tc
+	@mv ${core}/usr/share/littlebird-tc/TrustCenter/scripts ${core}/var/lib/littlebird-tc/bin
+	@mv ${core}/usr/share/littlebird-tc/TrustCenter/zf.sh ${core}/var/lib/littlebird-tc/bin/
+	@mv ${core}/usr/share/littlebird-tc/TrustCenter/zf_conf.sh ${core}/var/lib/littlebird-tc/bin/
+#	MUST FIX: directory 'instituteTypes' does not exist in original sorces
+	#@mv ${core}/usr/share/littlebird-tc/TrustCenter/public/images/icons/instituteTypes/* \
+	#	${core}/var/lib/littlebird-tc/public/images/icons/instituteTypes
 
 	# purge .gitignore
 	@find ${core} ${common} ${sql} -type f -name .gitignore -delete
 
-	# fix permissions
-	chmod +x ${core}/usr/share/littlebird-tc/TrustCenter/scripts/install_update_db
+	# fix owner/group and permissions
+	@chmod -R g+w ${core}/var/lib/littlebird-tc/CA
+	@chmod -R g+w ${core}/var/lib/littlebird-tc/data
+#       MUST FIX: directory 'instituteTypes' does not exist in original sorces
+#	@chmod -R g+w {core}/var/lib/littlebird-tc/public/images/icons/instituteTypes
+	@chmod -R u+x ${core}/var/lib/littlebird-tc/bin/*
 
-override_dh_link:
+#override_dh_link:
 	@dh_link
-	for dir in ${core}/var/lib/littlebird-tc/*; do \
+	for dir in ${core}/var/lib/littlebird-tc/data/*; do \
 	    dir=`basename $$dir`; \
-	    dh_link --package littlebird-tc-core /var/lib/littlebird-tc/$$dir /usr/share/littlebird-tc/TrustCenter/data/$$dir ;\
+	    dh_link --package littlebird-tc-core /var/lib/littlebird-tc/data/$$dir /usr/share/littlebird-tc/TrustCenter/data/$$dir ;\
 	done