Todo: cleanup catalog structure

[tlambert03]

The catalog structure has already gotten a little hard to reason about (particularly with regards to aliases). It needs to be documented better, commented, and cleaned up