Moved steps back into single folder structure until it can be figured out how to make RubyMine play nicer with nested structure