Restructure File names