move stuff around to rightful place
bump behat version to use the latest