Project Reorganization
CmdBuildMapper updated