files renaming and reorganised