Moving all program commands into CLI