Features directory organized.
Features directory organized.