change folder names
tidy up date