Changed dirs structure slightly.