Changed a directory stracture for PSM support