Added the cli file + reorganisation.