Breakup CLI into separate files