Reorg packages
deleted
added clientType enum