updated folders

to match master