adding file extension for feature

adding file extension for feature and various tidy up and bringing goals to higher level