better arrangement
more rework and reorg