optimize the Directory Structure for PAP