Split cli code into seperate files
Merge pull request #399 from colinwren/development

Split cli code into seperate files