Move extra commands into folder

Change-Id: I41a02ea529ed104f14453f8ab599b384aa4e21d6
Merge "Move extra commands into folder"