- Renamed catalog entries so they can be programmatically processed.
+ Made resources to be read from catalog files.