Refactoring

- Replace fields and container with source and target
- Add tests for the new variables