reorganize architecture.