migrating to EAP 3 & directory-based format