Removed unused folders.. again