Change filename convention to shorter paths
Change filename convention to shorter paths