move classes related to the CLI application to their own namespace