- Renamed formatting/parsing artefacts.
- Moved generic parts into common subpackage.
Merge remote-tracking branch 'origin/master'