Revert "Restructure again :-)"

This reverts commit 84e78bd7321f006ee334f7915129fe06bb478c75.