switched to symbolic links and minor adaptions