Merged both classes in one file

This makes it easier to reuse it in one-off scripts.