restructures directories; refactors icon inclusion;