Refractor cluster to support the module concept
clean the old code, update to use the new module , shell command