cleanup folder names