restructuring the cmdlets and adding new ones