Structure for running cukes against mode
renamed directory
renamed variable
extracted methods are now indented to the proper level