restructured specs and changes in feature names.