folder structure fixes