Small reorganazation of feature folder.