some fixes, create directory per SI file