Organize step_definitions and remove old files
Merge pull request #128 from tuxedio/c-spring-cleaning-although-its-summer

Organize step_definitions and remove old files