rename file from features to concept
update 2: a bit more cleanup