Use "expect" syntax
Move from features to requests

This seems to match the 4.0 file structure better