Fix directory hierarchy