Restructure cli
warning added
Improved scripts