Add catalog action

Adds a new action to allow you to add files/folders directly to the catalog.

Plus a few other tidyups