added code for removing old shortcuts
consolidated Infrastructure and Workbench components. added validation for required components (Infrastructure and Workbench).