Change folder structure slightly