Complete rewrite

[dalum]

This will basically break everything, but the package was never published, so hopefully no one will mind. The old branches can still be accessed by commit anyway.