Refactored OrgmateShell