Refactored machines part including cli and added rename functionality to cli
Removed unused file and data attributes from machines CLI