Splitted command handlers into different file