fixing dirs, rules
5th try, much better now