Reorganizing cucumber features
Merge pull request #1388 from scottsds/cucumber_reorganization

Reorganizing cucumber features