OPENAM-8481 Remove unnecessary properties and fix invalid references
Integrating AME-2372 branch part II: * Moving resources to their correct locations