Move the aai-schema, annotations and