Yeah, that organization makes sense to me. We want to allow users to add custom menu buttons from the client and server for the moment at least, so it makes sense for this to stay where it is.