Directory split fixed, also moved to proper setter.