BUG FIX - remaining folders from 2.3 update