Re-organized classes in api.command into correct packages