removed cli-type not necessary anymore
added options for files and templates and did some small refactoring