Cli module added, console file reorganized