Revert "Adding two new classes (Feature and FeatureModel:)"

This reverts commit dfd3c57dd2daef900c07e92bb701e1437f22d633.
Revert "2,6 Add Feature and FeatureModel"

This reverts commit 3ca2eccde5c9f8c87dfc6f3660152e5bdd8bc921.