Combine cmd directories for operator-controller and catalogd

[tmshort]

Combine the main.go files for operator-controller and catalogd into a single directory structure.

[tmshort]

This complains of "internal" packages when accessing catalogd/internal, so those must be moved first.

[camilamacedo86]

I am closing this one.
It seems done already.
However, if not please feel free to re-open.

[tmshort]

Fixed by #1802