fix names and directory structere to allow storing in central registry