Change folder structure without custom folders