Added command listings and folders based on commands; Evaluating command and parameter separately.