rename Files folders and polish code