Renamed cli back to commands #36