- Renamed formatting/parsing artefacts.
- Moved generic parts into common subpackage.