Fail on exception.
Rearrange package structure to make it easier to understand.