Move commandserver feature items into separate mx and tomo features