reorganize rules, add rules for TS6 (paths) and definitions for TS7 (Iscontr, Hfiber, ...)