Import from multiple formats

Author:    babelouest <github@babelouest.org>

And cleanup from the WTF! commits...