Restructured directories and new icon