Change to a flat package structure. Rename testing data structures to make their function obvious.