[Updated] Move  CommandManager to util package