Move specific commands to better namespaces