reorganization in Client Project

reorganization in Client Project