There is too many to change for a new distribution version. Also there are many duplications in packaging dirs.