OPENAM-3634 FR-451
Integrating AME-2372 branch part II: * Moving resources to their correct locations