Relocate files to remove redundant directories#288

acoulton merged 2 commits intoBehat:masterBehat/Gherkin:masterfrom

uuf6429:chore/relocate-filesuuf6429/Gherkin:chore/relocate-filesCopy head branch name to clipboard