Updated folder locations and icon