- Little restructurization.
- RawToken structure is updated.
- Tests fixed.