A big refactor. File name indicates command name.