CLI Enhancements + parse files and folders