fix of cli bugs and change modules so not moved from node_modules