Reorganize all architecture by Yoon