Internal dir reorganization