a8683d3 Restructure according to the PR comment.

Authored and Committed by lruzicka 4 years ago
    Restructure according to the PR comment.