change folder structure ; add multiple, see #7