Cucumber is integrated...
Revert "Refactoring project structure"

This reverts commit 9b8e343916d2a720349a97fa01e3d8a80b4c0d4f.
Refactoring project structure
Revert "Cucumber is integrated..."

This reverts commit 97c1aef7437022a9b51e4ed5f256561704e6d835.
Now Cucumber is really integrated...