Hi,

The refactoring for WINDUP-272 and WINDUP-274 is done.

However, it changed so many files, that I would need another few days to merge.
The commits after the structural changes just changed few files, so I suggest:

Let's merge my PR, then do the changes again (it's just few dir move steps), and put the rest of the commits on top of that.

Ondra

PS: It would  be COOL if such structural changes would be done when we don't expect a big commit.