refactor package structure fo visitors and filters