Restructuring for SDK