Updated features module
Features' rearrangement as to prevent conflicts + deleting deprecated features