Move into subfolder; add icons