changed folder names

to be more consistent