Move catalyst_support, builder, catalyst_lock out of modules, into the catalyst names...