Move commands into main package.