Reorganize Behat features