Fix folder structure.

Thanks: obviousjim