rename and organize folders :+1: