Accidently merged folders

Accidently merged folders last time instead of replacing them.  This
should be right hopefully.