Moving features to a Features sub folder and removing Feature suffix