Added new icons, refactored folders