Eval visitor

- Eval visitor
- package relocationing
- little refactoring