Have changed the DATA/INDEX dir to not be a database dir.
(and made some changes for better result files.)