Extend installation_structure validation

Change-Id: I0debc8f1d0d920054d99b6d0e1a9b8f6f316cdcb