diff --git a/Cartfile b/Cartfile
deleted file mode 100644
index 3102e51..0000000
--- a/Cartfile
+++ /dev/null
@@ -1 +0,0 @@
-github "socketio/socket.io-client-swift"
diff --git a/EverLayout.podspec b/EverLayout.podspec
index a7421ba..964718c 100644
--- a/EverLayout.podspec
+++ b/EverLayout.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "EverLayout"
-  s.version      = "0.8.3"
+  s.version      = "0.9.0"
   s.summary      = "Reusable, downloadable, up-datable iOS layouts"
 
   s.homepage     = "https://github.com/acrocat/EverLayout"
@@ -13,5 +13,5 @@ Pod::Spec.new do |s|
 
   s.source       = { :git => "https://github.com/acrocat/EverLayout.git", :tag => "#{s.version}" }
 
-  s.source_files  = "EverLayout", "EverLayout/Classes/**/*.{swift}"
+  s.source_files  = "EverLayout", "Source/**/*.{swift}"
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index 9ca8eaa..d4fded7 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  EverLayout: 7c58a5587b72772801963085a11da4cba51451b8
+  EverLayout: 584790b1ec6c42c935bd6ba996d290cb6cb8a5ae
 
 PODFILE CHECKSUM: 3ad4d29e3ae7babd77c018b416f6c4731d8e4c44
 
diff --git a/README.md b/README.md
index fa3269f..9bd8b67 100644
--- a/README.md
+++ b/README.md
@@ -135,10 +135,6 @@ layouts described with code.
 
 [Building and distributing iOS Layouts with EverLayout](https://hackernoon.com/building-and-distributing-ios-layouts-with-everlayout-c9ea41750f6#.b41s5bsh7)
 
-## Dependencies
-
-At the moment EverLayout uses [Socket.IO](https://github.com/socketio/socket.io-client-swift) for communication with EverLayout Bridge.
-
 ## Contribute
 
 Contributions to EverLayout are welcome! If you have feature requests please raise an issue, or contact me at [sterdefs@gmail.com](mailto:sterdefs@gmail.com), or [@greatirl](http://www.twitter.com/greatirl).
diff --git a/EverLayout/Classes/ELConstraint.swift b/Source/ELConstraint.swift
similarity index 100%
rename from EverLayout/Classes/ELConstraint.swift
rename to Source/ELConstraint.swift
diff --git a/EverLayout/Classes/EverLayout.h b/Source/EverLayout.h
similarity index 100%
rename from EverLayout/Classes/EverLayout.h
rename to Source/EverLayout.h
diff --git a/EverLayout/Classes/EverLayoutBridge.swift b/Source/EverLayoutBridge.swift
similarity index 100%
rename from EverLayout/Classes/EverLayoutBridge.swift
rename to Source/EverLayoutBridge.swift
diff --git a/EverLayout/Classes/Extensions/NSObject+EverLayout.swift b/Source/Extensions/NSObject+EverLayout.swift
similarity index 100%
rename from EverLayout/Classes/Extensions/NSObject+EverLayout.swift
rename to Source/Extensions/NSObject+EverLayout.swift
diff --git a/EverLayout/Classes/Extensions/String+EverLayout.swift b/Source/Extensions/String+EverLayout.swift
similarity index 100%
rename from EverLayout/Classes/Extensions/String+EverLayout.swift
rename to Source/Extensions/String+EverLayout.swift
diff --git a/EverLayout/Classes/Extensions/UIColor+EverLayout.swift b/Source/Extensions/UIColor+EverLayout.swift
similarity index 100%
rename from EverLayout/Classes/Extensions/UIColor+EverLayout.swift
rename to Source/Extensions/UIColor+EverLayout.swift
diff --git a/EverLayout/Classes/Extensions/UIImage+Swift.swift b/Source/Extensions/UIImage+Swift.swift
similarity index 100%
rename from EverLayout/Classes/Extensions/UIImage+Swift.swift
rename to Source/Extensions/UIImage+Swift.swift
diff --git a/EverLayout/Classes/Extensions/UIView+EverLayout.swift b/Source/Extensions/UIView+EverLayout.swift
similarity index 100%
rename from EverLayout/Classes/Extensions/UIView+EverLayout.swift
rename to Source/Extensions/UIView+EverLayout.swift
diff --git a/EverLayout/Classes/Model/ELConstraintConstant.swift b/Source/Model/ELConstraintConstant.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELConstraintConstant.swift
rename to Source/Model/ELConstraintConstant.swift
diff --git a/EverLayout/Classes/Model/ELConstraintContext.swift b/Source/Model/ELConstraintContext.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELConstraintContext.swift
rename to Source/Model/ELConstraintContext.swift
diff --git a/EverLayout/Classes/Model/ELConstraintModel.swift b/Source/Model/ELConstraintModel.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELConstraintModel.swift
rename to Source/Model/ELConstraintModel.swift
diff --git a/EverLayout/Classes/Model/ELConstraintMultiplier.swift b/Source/Model/ELConstraintMultiplier.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELConstraintMultiplier.swift
rename to Source/Model/ELConstraintMultiplier.swift
diff --git a/EverLayout/Classes/Model/ELLayoutTemplate.swift b/Source/Model/ELLayoutTemplate.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELLayoutTemplate.swift
rename to Source/Model/ELLayoutTemplate.swift
diff --git a/EverLayout/Classes/Model/ELRawData.swift b/Source/Model/ELRawData.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELRawData.swift
rename to Source/Model/ELRawData.swift
diff --git a/EverLayout/Classes/Model/ELReporter.swift b/Source/Model/ELReporter.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELReporter.swift
rename to Source/Model/ELReporter.swift
diff --git a/EverLayout/Classes/Model/ELViewModel.swift b/Source/Model/ELViewModel.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELViewModel.swift
rename to Source/Model/ELViewModel.swift
diff --git a/EverLayout/Classes/Model/ELViewProperty.swift b/Source/Model/ELViewProperty.swift
similarity index 100%
rename from EverLayout/Classes/Model/ELViewProperty.swift
rename to Source/Model/ELViewProperty.swift
diff --git a/EverLayout/Classes/Model/EverLayout.swift b/Source/Model/EverLayout.swift
similarity index 100%
rename from EverLayout/Classes/Model/EverLayout.swift
rename to Source/Model/EverLayout.swift
diff --git a/EverLayout/Classes/Model/ViewIndex.swift b/Source/Model/ViewIndex.swift
similarity index 100%
rename from EverLayout/Classes/Model/ViewIndex.swift
rename to Source/Model/ViewIndex.swift
diff --git a/EverLayout/Classes/Parsers/ELJSON.swift b/Source/Parsers/ELJSON.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/ELJSON.swift
rename to Source/Parsers/ELJSON.swift
diff --git a/EverLayout/Classes/Parsers/LayoutConstraintJSONComprehensiveParser.swift b/Source/Parsers/LayoutConstraintJSONComprehensiveParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutConstraintJSONComprehensiveParser.swift
rename to Source/Parsers/LayoutConstraintJSONComprehensiveParser.swift
diff --git a/EverLayout/Classes/Parsers/LayoutConstraintJSONParser.swift b/Source/Parsers/LayoutConstraintJSONParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutConstraintJSONParser.swift
rename to Source/Parsers/LayoutConstraintJSONParser.swift
diff --git a/EverLayout/Classes/Parsers/LayoutConstraintJSONShorthandParser.swift b/Source/Parsers/LayoutConstraintJSONShorthandParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutConstraintJSONShorthandParser.swift
rename to Source/Parsers/LayoutConstraintJSONShorthandParser.swift
diff --git a/EverLayout/Classes/Parsers/LayoutIndexJSONParser.swift b/Source/Parsers/LayoutIndexJSONParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutIndexJSONParser.swift
rename to Source/Parsers/LayoutIndexJSONParser.swift
diff --git a/EverLayout/Classes/Parsers/LayoutPropertyJSONParser.swift b/Source/Parsers/LayoutPropertyJSONParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutPropertyJSONParser.swift
rename to Source/Parsers/LayoutPropertyJSONParser.swift
diff --git a/EverLayout/Classes/Parsers/LayoutTemplateJSONParser.swift b/Source/Parsers/LayoutTemplateJSONParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutTemplateJSONParser.swift
rename to Source/Parsers/LayoutTemplateJSONParser.swift
diff --git a/EverLayout/Classes/Parsers/LayoutViewJSONParser.swift b/Source/Parsers/LayoutViewJSONParser.swift
similarity index 100%
rename from EverLayout/Classes/Parsers/LayoutViewJSONParser.swift
rename to Source/Parsers/LayoutViewJSONParser.swift
diff --git a/EverLayout/Classes/Protocols/EverLayoutDelegate.swift b/Source/Protocols/EverLayoutDelegate.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/EverLayoutDelegate.swift
rename to Source/Protocols/EverLayoutDelegate.swift
diff --git a/EverLayout/Classes/Protocols/LayoutConstraintParser.swift b/Source/Protocols/LayoutConstraintParser.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/LayoutConstraintParser.swift
rename to Source/Protocols/LayoutConstraintParser.swift
diff --git a/EverLayout/Classes/Protocols/LayoutIndexParser.swift b/Source/Protocols/LayoutIndexParser.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/LayoutIndexParser.swift
rename to Source/Protocols/LayoutIndexParser.swift
diff --git a/EverLayout/Classes/Protocols/LayoutParser.swift b/Source/Protocols/LayoutParser.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/LayoutParser.swift
rename to Source/Protocols/LayoutParser.swift
diff --git a/EverLayout/Classes/Protocols/LayoutPropertyParser.swift b/Source/Protocols/LayoutPropertyParser.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/LayoutPropertyParser.swift
rename to Source/Protocols/LayoutPropertyParser.swift
diff --git a/EverLayout/Classes/Protocols/LayoutTemplateParser.swift b/Source/Protocols/LayoutTemplateParser.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/LayoutTemplateParser.swift
rename to Source/Protocols/LayoutTemplateParser.swift
diff --git a/EverLayout/Classes/Protocols/LayoutViewParser.swift b/Source/Protocols/LayoutViewParser.swift
similarity index 100%
rename from EverLayout/Classes/Protocols/LayoutViewParser.swift
rename to Source/Protocols/LayoutViewParser.swift
diff --git a/EverLayout/Classes/Resolvers/PropertyMappable.swift b/Source/Resolvers/PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/PropertyMappable.swift
rename to Source/Resolvers/PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/PropertyResolver.swift b/Source/Resolvers/PropertyResolver.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/PropertyResolver.swift
rename to Source/Resolvers/PropertyResolver.swift
diff --git a/EverLayout/Classes/Resolvers/UIButton+PropertyMappable.swift b/Source/Resolvers/UIButton+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UIButton+PropertyMappable.swift
rename to Source/Resolvers/UIButton+PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/UIImageView+PropertyMappable.swift b/Source/Resolvers/UIImageView+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UIImageView+PropertyMappable.swift
rename to Source/Resolvers/UIImageView+PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/UILabel+PropertyMappable.swift b/Source/Resolvers/UILabel+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UILabel+PropertyMappable.swift
rename to Source/Resolvers/UILabel+PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/UINavigationBar+PropertyMappable.swift b/Source/Resolvers/UINavigationBar+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UINavigationBar+PropertyMappable.swift
rename to Source/Resolvers/UINavigationBar+PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/UIScrollView+PropertyMappable.swift b/Source/Resolvers/UIScrollView+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UIScrollView+PropertyMappable.swift
rename to Source/Resolvers/UIScrollView+PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/UITextField+PropertyMappable.swift b/Source/Resolvers/UITextField+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UITextField+PropertyMappable.swift
rename to Source/Resolvers/UITextField+PropertyMappable.swift
diff --git a/EverLayout/Classes/Resolvers/UIView+PropertyMappable.swift b/Source/Resolvers/UIView+PropertyMappable.swift
similarity index 100%
rename from EverLayout/Classes/Resolvers/UIView+PropertyMappable.swift
rename to Source/Resolvers/UIView+PropertyMappable.swift