Tidy CLI

CLI file requires the lib. Use public class method to load config.