Renaming and restructuring parts within the Sdk-classes