Fix underscore folders