Refractoring folder and names