Restructure citadel