Move commands into cmd

Change-Id: Ieb51e4af8ce88b725d8bf9c2753757261e39fea6