Change folder structure a bit.