Consolidated img and icon directories