Reorganize all architecture2 by Yoon