[WIP] identity mapping roughly work again after refaktoring

+ clean up imports
[WIP] non-abstract handler for all P2GAMs