[Command] Move command & command handlers to scenario's