Tests are in and passing.
Shuffled files around for gemification.