Files rename and cleanup