diff --git a/DoricCore.podspec b/DoricCore.podspec
index 1aacd147..c1d17c9c 100644
--- a/DoricCore.podspec
+++ b/DoricCore.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'DoricCore'
-  s.version          = '0.6.13'
+  s.version          = '0.10.59'
   s.summary          = 'Doric iOS SDK'
 
 
@@ -15,7 +15,7 @@ Doric iOS SDK for cross platform develpment
 
   s.ios.deployment_target = '8.0'
 
-  s.source_files = 'doric-iOS/Pod/Classes/**/*'
+  s.source_files = 'doric-iOS/Pod/Classes/**/*','doric-iOS/Pod/Yoga/**/*.h'
   s.resource_bundles = {
     'Doric' => ['doric-js/bundle/**/*']
   }
diff --git a/doric-iOS/Pod/Classes/Yoga/YogaKit/UIView+Yoga.h b/doric-iOS/Pod/Yoga/YogaKit/UIView+Yoga.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/YogaKit/UIView+Yoga.h
rename to doric-iOS/Pod/Yoga/YogaKit/UIView+Yoga.h
diff --git a/doric-iOS/Pod/Classes/Yoga/YogaKit/UIView+Yoga.m b/doric-iOS/Pod/Yoga/YogaKit/UIView+Yoga.m
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/YogaKit/UIView+Yoga.m
rename to doric-iOS/Pod/Yoga/YogaKit/UIView+Yoga.m
diff --git a/doric-iOS/Pod/Classes/Yoga/YogaKit/YGLayout+Private.h b/doric-iOS/Pod/Yoga/YogaKit/YGLayout+Private.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/YogaKit/YGLayout+Private.h
rename to doric-iOS/Pod/Yoga/YogaKit/YGLayout+Private.h
diff --git a/doric-iOS/Pod/Classes/Yoga/YogaKit/YGLayout.h b/doric-iOS/Pod/Yoga/YogaKit/YGLayout.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/YogaKit/YGLayout.h
rename to doric-iOS/Pod/Yoga/YogaKit/YGLayout.h
diff --git a/doric-iOS/Pod/Classes/Yoga/YogaKit/YGLayout.m b/doric-iOS/Pod/Yoga/YogaKit/YGLayout.m
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/YogaKit/YGLayout.m
rename to doric-iOS/Pod/Yoga/YogaKit/YGLayout.m
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/CompactValue.h b/doric-iOS/Pod/Yoga/yoga/CompactValue.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/CompactValue.h
rename to doric-iOS/Pod/Yoga/yoga/CompactValue.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/Utils.cpp b/doric-iOS/Pod/Yoga/yoga/Utils.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/Utils.cpp
rename to doric-iOS/Pod/Yoga/yoga/Utils.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/Utils.h b/doric-iOS/Pod/Yoga/yoga/Utils.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/Utils.h
rename to doric-iOS/Pod/Yoga/yoga/Utils.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGConfig.cpp b/doric-iOS/Pod/Yoga/yoga/YGConfig.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGConfig.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGConfig.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGConfig.h b/doric-iOS/Pod/Yoga/yoga/YGConfig.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGConfig.h
rename to doric-iOS/Pod/Yoga/yoga/YGConfig.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGEnums.cpp b/doric-iOS/Pod/Yoga/yoga/YGEnums.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGEnums.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGEnums.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGEnums.h b/doric-iOS/Pod/Yoga/yoga/YGEnums.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGEnums.h
rename to doric-iOS/Pod/Yoga/yoga/YGEnums.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGFloatOptional.h b/doric-iOS/Pod/Yoga/yoga/YGFloatOptional.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGFloatOptional.h
rename to doric-iOS/Pod/Yoga/yoga/YGFloatOptional.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGLayout.cpp b/doric-iOS/Pod/Yoga/yoga/YGLayout.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGLayout.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGLayout.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGLayout.h b/doric-iOS/Pod/Yoga/yoga/YGLayout.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGLayout.h
rename to doric-iOS/Pod/Yoga/yoga/YGLayout.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGMacros.h b/doric-iOS/Pod/Yoga/yoga/YGMacros.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGMacros.h
rename to doric-iOS/Pod/Yoga/yoga/YGMacros.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGMarker.cpp b/doric-iOS/Pod/Yoga/yoga/YGMarker.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGMarker.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGMarker.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGMarker.h b/doric-iOS/Pod/Yoga/yoga/YGMarker.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGMarker.h
rename to doric-iOS/Pod/Yoga/yoga/YGMarker.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGNode.cpp b/doric-iOS/Pod/Yoga/yoga/YGNode.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGNode.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGNode.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGNode.h b/doric-iOS/Pod/Yoga/yoga/YGNode.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGNode.h
rename to doric-iOS/Pod/Yoga/yoga/YGNode.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGNodePrint.cpp b/doric-iOS/Pod/Yoga/yoga/YGNodePrint.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGNodePrint.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGNodePrint.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGNodePrint.h b/doric-iOS/Pod/Yoga/yoga/YGNodePrint.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGNodePrint.h
rename to doric-iOS/Pod/Yoga/yoga/YGNodePrint.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGStyle.cpp b/doric-iOS/Pod/Yoga/yoga/YGStyle.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGStyle.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGStyle.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGStyle.h b/doric-iOS/Pod/Yoga/yoga/YGStyle.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGStyle.h
rename to doric-iOS/Pod/Yoga/yoga/YGStyle.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGValue.cpp b/doric-iOS/Pod/Yoga/yoga/YGValue.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGValue.cpp
rename to doric-iOS/Pod/Yoga/yoga/YGValue.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/YGValue.h b/doric-iOS/Pod/Yoga/yoga/YGValue.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/YGValue.h
rename to doric-iOS/Pod/Yoga/yoga/YGValue.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/Yoga-internal.h b/doric-iOS/Pod/Yoga/yoga/Yoga-internal.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/Yoga-internal.h
rename to doric-iOS/Pod/Yoga/yoga/Yoga-internal.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/Yoga.cpp b/doric-iOS/Pod/Yoga/yoga/Yoga.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/Yoga.cpp
rename to doric-iOS/Pod/Yoga/yoga/Yoga.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/Yoga.h b/doric-iOS/Pod/Yoga/yoga/Yoga.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/Yoga.h
rename to doric-iOS/Pod/Yoga/yoga/Yoga.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/instrumentation.h b/doric-iOS/Pod/Yoga/yoga/instrumentation.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/instrumentation.h
rename to doric-iOS/Pod/Yoga/yoga/instrumentation.h
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/log.cpp b/doric-iOS/Pod/Yoga/yoga/log.cpp
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/log.cpp
rename to doric-iOS/Pod/Yoga/yoga/log.cpp
diff --git a/doric-iOS/Pod/Classes/Yoga/yoga/log.h b/doric-iOS/Pod/Yoga/yoga/log.h
similarity index 100%
rename from doric-iOS/Pod/Classes/Yoga/yoga/log.h
rename to doric-iOS/Pod/Yoga/yoga/log.h