Fixes #34
Cut the prefix and the file name and add only the relative path in the catalog
Fixes #36
Called the dictionary in the appropriate way.