moving feature files to feature directory and some comments/minor changes

as mentioned please have feature files in feature directory.

Please check out comments and also see if you can accept this pull request !