Started separating commands into files