Merge "Restructures directory structure of aas according to submodel"