Moved commands to separate file