[arch-dev-public] repo reorg