Make commands modules too for consistency