Changed CLI scripts
Updated default addins for new changes in file/folder structure.