fixed folder naming issues