Fix folder hierarchy.