Some changes to command class loader and structure.