Small renaming and detab.
Adding the feature model from the previous implementation.
Constraints are implemented, but not included in the feature model.