diff --git a/Demos/Controller/RootViewController.m b/Demos/Controller/RootViewController.m
index 87d7f8d..8e2f82d 100644
--- a/Demos/Controller/RootViewController.m
+++ b/Demos/Controller/RootViewController.m
@@ -26,7 +26,7 @@ - (void)viewDidLoad {
                        @"UIImage",
                        @"UIImageView",
                        @"UILable",
-                       @"UINavigationControlle",
+                       @"UINavigationController",
                        @"UIResponder",
                        @"UIScrollView",
                        @"UISearchBar",
diff --git a/Demos/Foundation/NSArray/NSArrayDemoViewController.h b/Demos/Foundation/NSArray/NSArrayDemoViewController.h
index 8aca5e7..f9b5888 100644
--- a/Demos/Foundation/NSArray/NSArrayDemoViewController.h
+++ b/Demos/Foundation/NSArray/NSArrayDemoViewController.h
@@ -7,6 +7,8 @@
 //
 
 #import "BaseViewController.h"
+#import "NSArray+Block.h"
+#import "NSArray+SafeAccess.h"
 
 @interface NSArrayDemoViewController : BaseViewController
 
diff --git a/Demos/Foundation/NSArray/NSArrayDemoViewController.m b/Demos/Foundation/NSArray/NSArrayDemoViewController.m
index 47b2529..334e1b9 100644
--- a/Demos/Foundation/NSArray/NSArrayDemoViewController.m
+++ b/Demos/Foundation/NSArray/NSArrayDemoViewController.m
@@ -17,6 +17,8 @@ @implementation NSArrayDemoViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view from its nib.
+    NSArray *array = @[@"one",@"two",@"three",@"four",@"five",@"six",@"one",@"one",@"one"];
+ 
 }
 
 - (void)didReceiveMemoryWarning {
diff --git a/IOS-Categories.xcodeproj/project.pbxproj b/IOS-Categories.xcodeproj/project.pbxproj
index 8d6eb10..434b45a 100644
--- a/IOS-Categories.xcodeproj/project.pbxproj
+++ b/IOS-Categories.xcodeproj/project.pbxproj
@@ -101,7 +101,6 @@
 		A28BE2E71A3E9F48005C4AC6 /* NSBundle+AppIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2CC1A3E9F48005C4AC6 /* NSBundle+AppIcon.m */; };
 		A28BE2E81A3E9F48005C4AC6 /* NSData+Encrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2CF1A3E9F48005C4AC6 /* NSData+Encrypt.m */; };
 		A28BE2EA1A3E9F48005C4AC6 /* NSDictionary+JsonString.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2D51A3E9F48005C4AC6 /* NSDictionary+JsonString.m */; };
-		A28BE2EB1A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2D71A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.m */; };
 		A28BE2EC1A3E9F48005C4AC6 /* NSObject+AssociatedObject.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2DA1A3E9F48005C4AC6 /* NSObject+AssociatedObject.m */; };
 		A28BE2ED1A3E9F48005C4AC6 /* NSString+DictionaryValue.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2DD1A3E9F48005C4AC6 /* NSString+DictionaryValue.m */; };
 		A28BE2F01A3E9F48005C4AC6 /* NSString+UrlEncode.m in Sources */ = {isa = PBXBuildFile; fileRef = A28BE2E31A3E9F48005C4AC6 /* NSString+UrlEncode.m */; };
@@ -321,8 +320,6 @@
 		A28BE2CF1A3E9F48005C4AC6 /* NSData+Encrypt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Encrypt.m"; sourceTree = "<group>"; };
 		A28BE2D41A3E9F48005C4AC6 /* NSDictionary+JsonString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+JsonString.h"; sourceTree = "<group>"; };
 		A28BE2D51A3E9F48005C4AC6 /* NSDictionary+JsonString.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+JsonString.m"; sourceTree = "<group>"; };
-		A28BE2D61A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableDictionary+IFNil.h"; sourceTree = "<group>"; };
-		A28BE2D71A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableDictionary+IFNil.m"; sourceTree = "<group>"; };
 		A28BE2D91A3E9F48005C4AC6 /* NSObject+AssociatedObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+AssociatedObject.h"; sourceTree = "<group>"; };
 		A28BE2DA1A3E9F48005C4AC6 /* NSObject+AssociatedObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+AssociatedObject.m"; sourceTree = "<group>"; };
 		A28BE2DC1A3E9F48005C4AC6 /* NSString+DictionaryValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+DictionaryValue.h"; sourceTree = "<group>"; };
@@ -491,7 +488,7 @@
 				A22725D11A3E72D50061605B /* Supporting Files */,
 			);
 			name = Categories;
-			path = categories;
+			path = "IOS-Categories";
 			sourceTree = "<group>";
 		};
 		A22725D11A3E72D50061605B /* Supporting Files */ = {
@@ -995,8 +992,6 @@
 			children = (
 				A28BE2D41A3E9F48005C4AC6 /* NSDictionary+JsonString.h */,
 				A28BE2D51A3E9F48005C4AC6 /* NSDictionary+JsonString.m */,
-				A28BE2D61A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.h */,
-				A28BE2D71A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.m */,
 				A2AF02A21A74BACB003FEC8D /* NSDictionary+SafeAccess.h */,
 				A2AF02A31A74BACB003FEC8D /* NSDictionary+SafeAccess.m */,
 				A2AF02A81A74C096003FEC8D /* NSDictionary+Merge.h */,
@@ -1330,7 +1325,7 @@
 			dependencies = (
 			);
 			name = "IOS-Categories";
-			productName = categories;
+			productName = "IOS-Categories";
 			productReference = A22725CE1A3E72D50061605B /* IOS-Categories.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -1487,7 +1482,6 @@
 				A2768FD31A5518C400E03C90 /* UIView+Toast.m in Sources */,
 				A2681A411A75C788009BA7EE /* NSData+Base64.m in Sources */,
 				A281FBF91AC813B8009040DA /* UITextViewDemoViewController.m in Sources */,
-				A28BE2EB1A3E9F48005C4AC6 /* NSMutableDictionary+IFNil.m in Sources */,
 				A29266521A78976B00D01EDA /* UIResponder+UIAdapt.m in Sources */,
 				A28BE3551A3EAA21005C4AC6 /* NSObject+Blocks.m in Sources */,
 				A2681A441A75C7C8009BA7EE /* NSString+Encrypt.m in Sources */,
@@ -1634,7 +1628,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = categories/Info.plist;
+				INFOPLIST_FILE = "IOS-Categories/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "IOS-Categories";
@@ -1645,7 +1639,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				INFOPLIST_FILE = categories/Info.plist;
+				INFOPLIST_FILE = "IOS-Categories/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_NAME = "IOS-Categories";
diff --git a/categories/AppDelegate.h b/IOS-Categories/AppDelegate.h
similarity index 100%
rename from categories/AppDelegate.h
rename to IOS-Categories/AppDelegate.h
diff --git a/categories/AppDelegate.m b/IOS-Categories/AppDelegate.m
similarity index 100%
rename from categories/AppDelegate.m
rename to IOS-Categories/AppDelegate.m
diff --git a/categories/Base.lproj/LaunchScreen.xib b/IOS-Categories/Base.lproj/LaunchScreen.xib
similarity index 100%
rename from categories/Base.lproj/LaunchScreen.xib
rename to IOS-Categories/Base.lproj/LaunchScreen.xib
diff --git a/categories/Foundation/NSArray/NSArray+Block.h b/IOS-Categories/Foundation/NSArray/NSArray+Block.h
similarity index 100%
rename from categories/Foundation/NSArray/NSArray+Block.h
rename to IOS-Categories/Foundation/NSArray/NSArray+Block.h
diff --git a/categories/Foundation/NSArray/NSArray+Block.m b/IOS-Categories/Foundation/NSArray/NSArray+Block.m
similarity index 100%
rename from categories/Foundation/NSArray/NSArray+Block.m
rename to IOS-Categories/Foundation/NSArray/NSArray+Block.m
diff --git a/IOS-Categories/Foundation/NSArray/NSArray+SafeAccess.h b/IOS-Categories/Foundation/NSArray/NSArray+SafeAccess.h
new file mode 100644
index 0000000..404d792
--- /dev/null
+++ b/IOS-Categories/Foundation/NSArray/NSArray+SafeAccess.h
@@ -0,0 +1,81 @@
+//
+//  NSArray+SafeAccess.h
+//  IOS-Categories
+//
+//  Created by Jakey on 15/2/8.
+//  Copyright (c) 2015年 www.skyfox.org. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface NSArray (SafeAccess)
+-(id)objectWithIndex:(NSUInteger)index;
+
+- (NSString*)stringWithIndex:(NSUInteger)index;
+
+- (NSNumber*)numberWithIndex:(NSUInteger)index;
+
+- (NSArray*)arrayWithIndex:(NSUInteger)index;
+
+- (NSDictionary*)dictionaryWithIndex:(NSUInteger)index;
+
+- (NSInteger)integerWithIndex:(NSUInteger)index;
+
+- (NSUInteger)unsignedIntegerWithIndex:(NSUInteger)index;
+
+- (BOOL)boolWithIndex:(NSUInteger)index;
+
+- (int16_t)int16WithIndex:(NSUInteger)index;
+
+- (int32_t)int32WithIndex:(NSUInteger)index;
+
+- (int64_t)int64WithIndex:(NSUInteger)index;
+
+- (char)charWithIndex:(NSUInteger)index;
+
+- (short)shortWithIndex:(NSUInteger)index;
+
+- (float)floatWithIndex:(NSUInteger)index;
+
+- (double)doubleWithIndex:(NSUInteger)index;
+
+//CG
+- (CGFloat)CGFloatWithIndex:(NSUInteger)index;
+
+- (CGPoint)pointWithIndex:(NSUInteger)index;
+
+- (CGSize)sizeWithIndex:(NSUInteger)index;
+
+- (CGRect)rectWithIndex:(NSUInteger)index;
+@end
+
+
+#pragma --mark NSMutableArray setter
+
+@interface NSMutableArray(SafeAccess)
+
+-(void)addObj:(id)i;
+
+-(void)addString:(NSString*)i;
+
+-(void)addBool:(BOOL)i;
+
+-(void)addInt:(int)i;
+
+-(void)addInteger:(NSInteger)i;
+
+-(void)addUnsignedInteger:(NSUInteger)i;
+
+-(void)addCGFloat:(CGFloat)f;
+
+-(void)addChar:(char)c;
+
+-(void)addFloat:(float)i;
+
+-(void)addPoint:(CGPoint)o;
+
+-(void)addSize:(CGSize)o;
+
+-(void)addRect:(CGRect)o;
+@end
\ No newline at end of file
diff --git a/IOS-Categories/Foundation/NSArray/NSArray+SafeAccess.m b/IOS-Categories/Foundation/NSArray/NSArray+SafeAccess.m
new file mode 100644
index 0000000..364ea8f
--- /dev/null
+++ b/IOS-Categories/Foundation/NSArray/NSArray+SafeAccess.m
@@ -0,0 +1,324 @@
+//
+//  NSArray+SafeAccess.m
+//  IOS-Categories
+//
+//  Created by Jakey on 15/2/8.
+//  Copyright (c) 2015年 www.skyfox.org. All rights reserved.
+//
+
+#import "NSArray+SafeAccess.h"
+
+@implementation NSArray (SafeAccess)
+-(id)objectWithIndex:(NSUInteger)index{
+    if (index <self.count) {
+        return self[index];
+    }else{
+        return nil;
+    }
+}
+
+- (NSString*)stringWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    if (value == nil || value == [NSNull null])
+    {
+        return @"";
+    }
+    if ([value isKindOfClass:[NSString class]]) {
+        return (NSString*)value;
+    }
+    if ([value isKindOfClass:[NSNumber class]]) {
+        return [value stringValue];
+    }
+    
+    return nil;
+}
+
+
+- (NSNumber*)numberWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    if ([value isKindOfClass:[NSNumber class]]) {
+        return (NSNumber*)value;
+    }
+    if ([value isKindOfClass:[NSString class]]) {
+        NSNumberFormatter * f = [[NSNumberFormatter alloc] init];
+        [f setNumberStyle:NSNumberFormatterDecimalStyle];
+        return [f numberFromString:(NSString*)value];
+    }
+    return nil;
+}
+
+- (NSArray*)arrayWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    if (value == nil || value == [NSNull null])
+    {
+        return nil;
+    }
+    if ([value isKindOfClass:[NSArray class]])
+    {
+        return value;
+    }
+    return nil;
+}
+
+
+- (NSDictionary*)dictionaryWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    if (value == nil || value == [NSNull null])
+    {
+        return nil;
+    }
+    if ([value isKindOfClass:[NSDictionary class]])
+    {
+        return value;
+    }
+    return nil;
+}
+
+- (NSInteger)integerWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSNumber class]])
+    {
+        return [value integerValue];
+    }
+    return 0;
+}
+- (NSUInteger)unsignedIntegerWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSNumber class]])
+    {
+        return [value unsignedIntegerValue];
+    }
+    return 0;
+}
+- (BOOL)boolWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return NO;
+    }
+    if ([value isKindOfClass:[NSNumber class]])
+    {
+        return [value boolValue];
+    }
+    if ([value isKindOfClass:[NSString class]])
+    {
+        return [value boolValue];
+    }
+    return NO;
+}
+- (int16_t)int16WithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]])
+    {
+        return [value shortValue];
+    }
+    if ([value isKindOfClass:[NSString class]])
+    {
+        return [value intValue];
+    }
+    return 0;
+}
+- (int32_t)int32WithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]] || [value isKindOfClass:[NSString class]])
+    {
+        return [value intValue];
+    }
+    return 0;
+}
+- (int64_t)int64WithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]] || [value isKindOfClass:[NSString class]])
+    {
+        return [value longLongValue];
+    }
+    return 0;
+}
+
+- (char)charWithIndex:(NSUInteger)index{
+    
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]] || [value isKindOfClass:[NSString class]])
+    {
+        return [value charValue];
+    }
+    return 0;
+}
+
+- (short)shortWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]])
+    {
+        return [value shortValue];
+    }
+    if ([value isKindOfClass:[NSString class]])
+    {
+        return [value intValue];
+    }
+    return 0;
+}
+- (float)floatWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]] || [value isKindOfClass:[NSString class]])
+    {
+        return [value floatValue];
+    }
+    return 0;
+}
+- (double)doubleWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]] || [value isKindOfClass:[NSString class]])
+    {
+        return [value doubleValue];
+    }
+    return 0;
+}
+//CG
+- (CGFloat)CGFloatWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    CGFloat f = [value doubleValue];
+    
+    return f;
+}
+
+- (CGPoint)pointWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+
+    CGPoint point = CGPointFromString(value);
+    
+    return point;
+}
+- (CGSize)sizeWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+
+    CGSize size = CGSizeFromString(value);
+    
+    return size;
+}
+- (CGRect)rectWithIndex:(NSUInteger)index
+{
+    id value = [self objectWithIndex:index];
+    
+    CGRect rect = CGRectFromString(value);
+    
+    return rect;
+}
+@end
+
+
+#pragma --mark NSMutableArray setter
+@implementation NSMutableArray (SafeAccess)
+-(void)addObj:(id)i{
+    if (i!=nil) {
+        [self addObject:i];
+    }
+}
+-(void)addString:(NSString*)i
+{
+    if (i!=nil) {
+        [self addObject:i];
+    }
+}
+-(void)addBool:(BOOL)i
+{
+    [self addObject:@(i)];
+}
+-(void)addInt:(int)i
+{
+    [self addObject:@(i)];
+}
+-(void)addInteger:(NSInteger)i
+{
+    [self addObject:@(i)];
+}
+-(void)addUnsignedInteger:(NSUInteger)i
+{
+    [self addObject:@(i)];
+}
+-(void)addCGFloat:(CGFloat)f
+{
+   [self addObject:@(f)];
+}
+-(void)addChar:(char)c
+{
+    [self addObject:@(c)];
+}
+-(void)addFloat:(float)i
+{
+    [self addObject:@(i)];
+}
+-(void)addPoint:(CGPoint)o
+{
+    [self addObject:NSStringFromCGPoint(o)];
+}
+-(void)addSize:(CGSize)o
+{
+   [self addObject:NSStringFromCGSize(o)];
+}
+-(void)addRect:(CGRect)o
+{
+    [self addObject:NSStringFromCGRect(o)];
+}
+@end
+
diff --git a/categories/Foundation/NSBundle/NSBundle+AppIcon.h b/IOS-Categories/Foundation/NSBundle/NSBundle+AppIcon.h
similarity index 100%
rename from categories/Foundation/NSBundle/NSBundle+AppIcon.h
rename to IOS-Categories/Foundation/NSBundle/NSBundle+AppIcon.h
diff --git a/categories/Foundation/NSBundle/NSBundle+AppIcon.m b/IOS-Categories/Foundation/NSBundle/NSBundle+AppIcon.m
similarity index 100%
rename from categories/Foundation/NSBundle/NSBundle+AppIcon.m
rename to IOS-Categories/Foundation/NSBundle/NSBundle+AppIcon.m
diff --git a/categories/Foundation/NSData/NSData+Base64.h b/IOS-Categories/Foundation/NSData/NSData+Base64.h
similarity index 100%
rename from categories/Foundation/NSData/NSData+Base64.h
rename to IOS-Categories/Foundation/NSData/NSData+Base64.h
diff --git a/categories/Foundation/NSData/NSData+Base64.m b/IOS-Categories/Foundation/NSData/NSData+Base64.m
similarity index 100%
rename from categories/Foundation/NSData/NSData+Base64.m
rename to IOS-Categories/Foundation/NSData/NSData+Base64.m
diff --git a/categories/Foundation/NSData/NSData+Encrypt.h b/IOS-Categories/Foundation/NSData/NSData+Encrypt.h
similarity index 100%
rename from categories/Foundation/NSData/NSData+Encrypt.h
rename to IOS-Categories/Foundation/NSData/NSData+Encrypt.h
diff --git a/categories/Foundation/NSData/NSData+Encrypt.m b/IOS-Categories/Foundation/NSData/NSData+Encrypt.m
similarity index 100%
rename from categories/Foundation/NSData/NSData+Encrypt.m
rename to IOS-Categories/Foundation/NSData/NSData+Encrypt.m
diff --git a/categories/Foundation/NSData/NSData+Gzip.h b/IOS-Categories/Foundation/NSData/NSData+Gzip.h
similarity index 100%
rename from categories/Foundation/NSData/NSData+Gzip.h
rename to IOS-Categories/Foundation/NSData/NSData+Gzip.h
diff --git a/categories/Foundation/NSData/NSData+Gzip.m b/IOS-Categories/Foundation/NSData/NSData+Gzip.m
similarity index 100%
rename from categories/Foundation/NSData/NSData+Gzip.m
rename to IOS-Categories/Foundation/NSData/NSData+Gzip.m
diff --git a/categories/Foundation/NSDate/NSDate+Addition.h b/IOS-Categories/Foundation/NSDate/NSDate+Addition.h
similarity index 100%
rename from categories/Foundation/NSDate/NSDate+Addition.h
rename to IOS-Categories/Foundation/NSDate/NSDate+Addition.h
diff --git a/categories/Foundation/NSDate/NSDate+Addition.m b/IOS-Categories/Foundation/NSDate/NSDate+Addition.m
similarity index 100%
rename from categories/Foundation/NSDate/NSDate+Addition.m
rename to IOS-Categories/Foundation/NSDate/NSDate+Addition.m
diff --git a/categories/Foundation/NSDate/NSDate+Utilities.h b/IOS-Categories/Foundation/NSDate/NSDate+Utilities.h
similarity index 100%
rename from categories/Foundation/NSDate/NSDate+Utilities.h
rename to IOS-Categories/Foundation/NSDate/NSDate+Utilities.h
diff --git a/categories/Foundation/NSDate/NSDate+Utilities.m b/IOS-Categories/Foundation/NSDate/NSDate+Utilities.m
similarity index 100%
rename from categories/Foundation/NSDate/NSDate+Utilities.m
rename to IOS-Categories/Foundation/NSDate/NSDate+Utilities.m
diff --git a/categories/Foundation/NSDictionary/NSDictionary+JsonString.h b/IOS-Categories/Foundation/NSDictionary/NSDictionary+JsonString.h
similarity index 100%
rename from categories/Foundation/NSDictionary/NSDictionary+JsonString.h
rename to IOS-Categories/Foundation/NSDictionary/NSDictionary+JsonString.h
diff --git a/categories/Foundation/NSDictionary/NSDictionary+Merge.h b/IOS-Categories/Foundation/NSDictionary/NSDictionary+Merge.h
similarity index 100%
rename from categories/Foundation/NSDictionary/NSDictionary+Merge.h
rename to IOS-Categories/Foundation/NSDictionary/NSDictionary+Merge.h
diff --git a/categories/Foundation/NSDictionary/NSDictionary+Merge.m b/IOS-Categories/Foundation/NSDictionary/NSDictionary+Merge.m
similarity index 100%
rename from categories/Foundation/NSDictionary/NSDictionary+Merge.m
rename to IOS-Categories/Foundation/NSDictionary/NSDictionary+Merge.m
diff --git a/IOS-Categories/Foundation/NSDictionary/NSDictionary+SafeAccess.h b/IOS-Categories/Foundation/NSDictionary/NSDictionary+SafeAccess.h
new file mode 100644
index 0000000..0cf489d
--- /dev/null
+++ b/IOS-Categories/Foundation/NSDictionary/NSDictionary+SafeAccess.h
@@ -0,0 +1,78 @@
+//
+//  NSDictionary+SafeAccess.h
+//  IOS-Categories
+//
+//  Created by Jakey on 15/1/25.
+//  Copyright (c) 2015年 www.skyfox.org. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+@interface NSDictionary (SafeAccess)
+- (NSString*)stringForKey:(id)key;
+
+- (NSNumber*)numberForKey:(id)key;
+
+- (NSArray*)arrayForKey:(id)key;
+
+- (NSDictionary*)dictionaryForKey:(id)key;
+
+- (NSInteger)integerForKey:(id)key;
+
+- (NSUInteger)unsignedIntegerForKey:(id)key;
+
+- (BOOL)boolForKey:(id)key;
+
+- (int16_t)int16ForKey:(id)key;
+
+- (int32_t)int32ForKey:(id)key;
+
+- (int64_t)int64ForKey:(id)key;
+
+- (char)charForKey:(id)key;
+
+- (short)shortForKey:(id)key;
+
+- (float)floatForKey:(id)key;
+
+- (double)doubleForKey:(id)key;
+
+//CG
+- (CGFloat)CGFloatForKey:(id)key;
+
+- (CGPoint)pointForKey:(id)key;
+
+- (CGSize)sizeForKey:(id)key;
+
+- (CGRect)rectForKey:(id)key;
+@end
+
+#pragma --mark NSMutableDictionary setter
+
+@interface NSMutableDictionary(SafeAccess)
+
+-(void)setObj:(id)i forKey:(NSString*)key;
+
+-(void)setString:(NSString*)i forKey:(NSString*)key;
+
+-(void)setBool:(BOOL)i forKey:(NSString*)key;
+
+-(void)setInt:(int)i forKey:(NSString*)key;
+
+-(void)setInteger:(NSInteger)i forKey:(NSString*)key;
+
+-(void)setUnsignedInteger:(NSUInteger)i forKey:(NSString*)key;
+
+-(void)setCGFloat:(CGFloat)f forKey:(NSString*)key;
+
+-(void)setChar:(char)c forKey:(NSString*)key;
+
+-(void)setFloat:(float)i forKey:(NSString*)key;
+
+-(void)setPoint:(CGPoint)o forKey:(NSString*)key;
+
+-(void)setSize:(CGSize)o forKey:(NSString*)key;
+
+-(void)setRect:(CGRect)o forKey:(NSString*)key;
+@end
\ No newline at end of file
diff --git a/categories/Foundation/NSDictionary/NSDictionary+SafeAccess.m b/IOS-Categories/Foundation/NSDictionary/NSDictionary+SafeAccess.m
similarity index 64%
rename from categories/Foundation/NSDictionary/NSDictionary+SafeAccess.m
rename to IOS-Categories/Foundation/NSDictionary/NSDictionary+SafeAccess.m
index 5d30ec2..adb6cf0 100644
--- a/categories/Foundation/NSDictionary/NSDictionary+SafeAccess.m
+++ b/IOS-Categories/Foundation/NSDictionary/NSDictionary+SafeAccess.m
@@ -10,7 +10,7 @@
 
 @implementation NSDictionary (SafeAccess)
 
-- (NSString*)stringForKey:(NSString*)key
+- (NSString*)stringForKey:(id)key
 {
     id value = [self objectForKey:key];
     if (value == nil || value == [NSNull null])
@@ -27,8 +27,7 @@ - (NSString*)stringForKey:(NSString*)key
     return nil;
 }
 
-
-- (NSNumber*)numberForKey:(NSString*)key
+- (NSNumber*)numberForKey:(id)key
 {
     id value = [self objectForKey:key];
     if ([value isKindOfClass:[NSNumber class]]) {
@@ -42,7 +41,7 @@ - (NSNumber*)numberForKey:(NSString*)key
     return nil;
 }
 
-- (NSArray*)arrayForKey:(NSString*)key
+- (NSArray*)arrayForKey:(id)key
 {
     id value = [self objectForKey:key];
     if (value == nil || value == [NSNull null])
@@ -56,8 +55,7 @@ - (NSArray*)arrayForKey:(NSString*)key
     return nil;
 }
 
-
-- (NSDictionary*)dictionaryForKey:(NSString*)key
+- (NSDictionary*)dictionaryForKey:(id)key
 {
     id value = [self objectForKey:key];
     if (value == nil || value == [NSNull null])
@@ -84,6 +82,18 @@ - (NSInteger)integerForKey:(id)key
     }
     return 0;
 }
+- (NSUInteger)unsignedIntegerForKey:(id)key{
+    id value = [self objectForKey:key];
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSString class]] || [value isKindOfClass:[NSNumber class]])
+    {
+        return [value unsignedIntegerValue];
+    }
+    return 0;
+}
 - (BOOL)boolForKey:(id)key
 {
     id value = [self objectForKey:key];
@@ -148,6 +158,19 @@ - (int64_t)int64ForKey:(id)key
     }
     return 0;
 }
+- (char)charForKey:(id)key{
+    id value = [self objectForKey:key];
+    
+    if (value == nil || value == [NSNull null])
+    {
+        return 0;
+    }
+    if ([value isKindOfClass:[NSNumber class]] || [value isKindOfClass:[NSString class]])
+    {
+        return [value charValue];
+    }
+    return 0;
+}
 - (short)shortForKey:(id)key
 {
     id value = [self objectForKey:key];
@@ -194,5 +217,79 @@ - (double)doubleForKey:(id)key
     }
     return 0;
 }
+//CG
+- (CGFloat)CGFloatForKey:(id)key
+{
+    CGFloat f = [self[key] doubleValue];
+    return f;
+}
 
+- (CGPoint)pointForKey:(id)key
+{
+    CGPoint point = CGPointFromString(self[key]);
+    return point;
+}
+- (CGSize)sizeForKey:(id)key
+{
+    CGSize size = CGSizeFromString(self[key]);
+    return size;
+}
+- (CGRect)rectForKey:(id)key
+{
+    CGRect rect = CGRectFromString(self[key]);
+    return rect;
+}
+@end
+
+#pragma --mark NSMutableDictionary setter
+@implementation NSMutableDictionary (SafeAccess)
+-(void)setObj:(id)i forKey:(NSString*)key{
+    if (i!=nil) {
+        self[key] = i;
+    }
+}
+-(void)setString:(NSString*)i forKey:(NSString*)key;
+{
+    [self setValue:i forKey:key];
+}
+-(void)setBool:(BOOL)i forKey:(NSString *)key
+{
+    self[key] = @(i);
+}
+-(void)setInt:(int)i forKey:(NSString *)key
+{
+    self[key] = @(i);
+}
+-(void)setInteger:(NSInteger)i forKey:(NSString *)key
+{
+    self[key] = @(i);
+}
+-(void)setUnsignedInteger:(NSUInteger)i forKey:(NSString *)key
+{
+    self[key] = @(i);
+}
+-(void)setCGFloat:(CGFloat)f forKey:(NSString *)key
+{
+    self[key] = @(f);
+}
+-(void)setChar:(char)c forKey:(NSString *)key
+{
+    self[key] = @(c);
+}
+-(void)setFloat:(float)i forKey:(NSString *)key
+{
+    self[key] = @(i);
+}
+-(void)setPoint:(CGPoint)o forKey:(NSString *)key
+{
+    self[key] = NSStringFromCGPoint(o);
+}
+-(void)setSize:(CGSize)o forKey:(NSString *)key
+{
+    self[key] = NSStringFromCGSize(o);
+}
+-(void)setRect:(CGRect)o forKey:(NSString *)key
+{
+    self[key] = NSStringFromCGRect(o);
+}
 @end
diff --git a/categories/Foundation/NSDictionary/NSDictionary+jsonString.m b/IOS-Categories/Foundation/NSDictionary/NSDictionary+jsonString.m
similarity index 100%
rename from categories/Foundation/NSDictionary/NSDictionary+jsonString.m
rename to IOS-Categories/Foundation/NSDictionary/NSDictionary+jsonString.m
diff --git a/categories/Foundation/NSException/NSException+Trace.h b/IOS-Categories/Foundation/NSException/NSException+Trace.h
similarity index 100%
rename from categories/Foundation/NSException/NSException+Trace.h
rename to IOS-Categories/Foundation/NSException/NSException+Trace.h
diff --git a/categories/Foundation/NSException/NSException+Trace.m b/IOS-Categories/Foundation/NSException/NSException+Trace.m
similarity index 100%
rename from categories/Foundation/NSException/NSException+Trace.m
rename to IOS-Categories/Foundation/NSException/NSException+Trace.m
diff --git a/categories/Foundation/NSFileManager/NSFileManager+Paths.h b/IOS-Categories/Foundation/NSFileManager/NSFileManager+Paths.h
similarity index 100%
rename from categories/Foundation/NSFileManager/NSFileManager+Paths.h
rename to IOS-Categories/Foundation/NSFileManager/NSFileManager+Paths.h
diff --git a/categories/Foundation/NSFileManager/NSFileManager+Paths.m b/IOS-Categories/Foundation/NSFileManager/NSFileManager+Paths.m
similarity index 100%
rename from categories/Foundation/NSFileManager/NSFileManager+Paths.m
rename to IOS-Categories/Foundation/NSFileManager/NSFileManager+Paths.m
diff --git a/categories/Foundation/NSObject/NSObject+AddProperty.h b/IOS-Categories/Foundation/NSObject/NSObject+AddProperty.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+AddProperty.h
rename to IOS-Categories/Foundation/NSObject/NSObject+AddProperty.h
diff --git a/categories/Foundation/NSObject/NSObject+AddProperty.m b/IOS-Categories/Foundation/NSObject/NSObject+AddProperty.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+AddProperty.m
rename to IOS-Categories/Foundation/NSObject/NSObject+AddProperty.m
diff --git a/categories/Foundation/NSObject/NSObject+Additions.h b/IOS-Categories/Foundation/NSObject/NSObject+Additions.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Additions.h
rename to IOS-Categories/Foundation/NSObject/NSObject+Additions.h
diff --git a/categories/Foundation/NSObject/NSObject+Additions.m b/IOS-Categories/Foundation/NSObject/NSObject+Additions.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Additions.m
rename to IOS-Categories/Foundation/NSObject/NSObject+Additions.m
diff --git a/categories/Foundation/NSObject/NSObject+AssociatedObject.h b/IOS-Categories/Foundation/NSObject/NSObject+AssociatedObject.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+AssociatedObject.h
rename to IOS-Categories/Foundation/NSObject/NSObject+AssociatedObject.h
diff --git a/categories/Foundation/NSObject/NSObject+AssociatedObject.m b/IOS-Categories/Foundation/NSObject/NSObject+AssociatedObject.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+AssociatedObject.m
rename to IOS-Categories/Foundation/NSObject/NSObject+AssociatedObject.m
diff --git a/categories/Foundation/NSObject/NSObject+Blocks.h b/IOS-Categories/Foundation/NSObject/NSObject+Blocks.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Blocks.h
rename to IOS-Categories/Foundation/NSObject/NSObject+Blocks.h
diff --git a/categories/Foundation/NSObject/NSObject+Blocks.m b/IOS-Categories/Foundation/NSObject/NSObject+Blocks.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Blocks.m
rename to IOS-Categories/Foundation/NSObject/NSObject+Blocks.m
diff --git a/categories/Foundation/NSObject/NSObject+GCD.h b/IOS-Categories/Foundation/NSObject/NSObject+GCD.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+GCD.h
rename to IOS-Categories/Foundation/NSObject/NSObject+GCD.h
diff --git a/categories/Foundation/NSObject/NSObject+GCD.m b/IOS-Categories/Foundation/NSObject/NSObject+GCD.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+GCD.m
rename to IOS-Categories/Foundation/NSObject/NSObject+GCD.m
diff --git a/categories/Foundation/NSObject/NSObject+Property.h b/IOS-Categories/Foundation/NSObject/NSObject+Property.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Property.h
rename to IOS-Categories/Foundation/NSObject/NSObject+Property.h
diff --git a/categories/Foundation/NSObject/NSObject+Property.m b/IOS-Categories/Foundation/NSObject/NSObject+Property.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Property.m
rename to IOS-Categories/Foundation/NSObject/NSObject+Property.m
diff --git a/categories/Foundation/NSObject/NSObject+Runtime.h b/IOS-Categories/Foundation/NSObject/NSObject+Runtime.h
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Runtime.h
rename to IOS-Categories/Foundation/NSObject/NSObject+Runtime.h
diff --git a/categories/Foundation/NSObject/NSObject+Runtime.m b/IOS-Categories/Foundation/NSObject/NSObject+Runtime.m
similarity index 100%
rename from categories/Foundation/NSObject/NSObject+Runtime.m
rename to IOS-Categories/Foundation/NSObject/NSObject+Runtime.m
diff --git a/categories/Foundation/NSSet/NSSet+Block.h b/IOS-Categories/Foundation/NSSet/NSSet+Block.h
similarity index 100%
rename from categories/Foundation/NSSet/NSSet+Block.h
rename to IOS-Categories/Foundation/NSSet/NSSet+Block.h
diff --git a/categories/Foundation/NSSet/NSSet+Block.m b/IOS-Categories/Foundation/NSSet/NSSet+Block.m
similarity index 100%
rename from categories/Foundation/NSSet/NSSet+Block.m
rename to IOS-Categories/Foundation/NSSet/NSSet+Block.m
diff --git a/categories/Foundation/NSString/NSString+Base64.h b/IOS-Categories/Foundation/NSString/NSString+Base64.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+Base64.h
rename to IOS-Categories/Foundation/NSString/NSString+Base64.h
diff --git a/categories/Foundation/NSString/NSString+Base64.m b/IOS-Categories/Foundation/NSString/NSString+Base64.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+Base64.m
rename to IOS-Categories/Foundation/NSString/NSString+Base64.m
diff --git a/categories/Foundation/NSString/NSString+DictionaryValue.h b/IOS-Categories/Foundation/NSString/NSString+DictionaryValue.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+DictionaryValue.h
rename to IOS-Categories/Foundation/NSString/NSString+DictionaryValue.h
diff --git a/categories/Foundation/NSString/NSString+DictionaryValue.m b/IOS-Categories/Foundation/NSString/NSString+DictionaryValue.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+DictionaryValue.m
rename to IOS-Categories/Foundation/NSString/NSString+DictionaryValue.m
diff --git a/categories/Foundation/NSString/NSString+Emoji.h b/IOS-Categories/Foundation/NSString/NSString+Emoji.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+Emoji.h
rename to IOS-Categories/Foundation/NSString/NSString+Emoji.h
diff --git a/categories/Foundation/NSString/NSString+Emoji.m b/IOS-Categories/Foundation/NSString/NSString+Emoji.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+Emoji.m
rename to IOS-Categories/Foundation/NSString/NSString+Emoji.m
diff --git a/categories/Foundation/NSString/NSString+Encrypt.h b/IOS-Categories/Foundation/NSString/NSString+Encrypt.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+Encrypt.h
rename to IOS-Categories/Foundation/NSString/NSString+Encrypt.h
diff --git a/categories/Foundation/NSString/NSString+Encrypt.m b/IOS-Categories/Foundation/NSString/NSString+Encrypt.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+Encrypt.m
rename to IOS-Categories/Foundation/NSString/NSString+Encrypt.m
diff --git a/categories/Foundation/NSString/NSString+Hash.h b/IOS-Categories/Foundation/NSString/NSString+Hash.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+Hash.h
rename to IOS-Categories/Foundation/NSString/NSString+Hash.h
diff --git a/categories/Foundation/NSString/NSString+Hash.m b/IOS-Categories/Foundation/NSString/NSString+Hash.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+Hash.m
rename to IOS-Categories/Foundation/NSString/NSString+Hash.m
diff --git a/categories/Foundation/NSString/NSString+Score.h b/IOS-Categories/Foundation/NSString/NSString+Score.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+Score.h
rename to IOS-Categories/Foundation/NSString/NSString+Score.h
diff --git a/categories/Foundation/NSString/NSString+Score.m b/IOS-Categories/Foundation/NSString/NSString+Score.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+Score.m
rename to IOS-Categories/Foundation/NSString/NSString+Score.m
diff --git a/categories/Foundation/NSString/NSString+Trims.h b/IOS-Categories/Foundation/NSString/NSString+Trims.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+Trims.h
rename to IOS-Categories/Foundation/NSString/NSString+Trims.h
diff --git a/categories/Foundation/NSString/NSString+Trims.m b/IOS-Categories/Foundation/NSString/NSString+Trims.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+Trims.m
rename to IOS-Categories/Foundation/NSString/NSString+Trims.m
diff --git a/categories/Foundation/NSString/NSString+UUID.h b/IOS-Categories/Foundation/NSString/NSString+UUID.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+UUID.h
rename to IOS-Categories/Foundation/NSString/NSString+UUID.h
diff --git a/categories/Foundation/NSString/NSString+UUID.m b/IOS-Categories/Foundation/NSString/NSString+UUID.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+UUID.m
rename to IOS-Categories/Foundation/NSString/NSString+UUID.m
diff --git a/categories/Foundation/NSString/NSString+UrlEncode.h b/IOS-Categories/Foundation/NSString/NSString+UrlEncode.h
similarity index 100%
rename from categories/Foundation/NSString/NSString+UrlEncode.h
rename to IOS-Categories/Foundation/NSString/NSString+UrlEncode.h
diff --git a/categories/Foundation/NSString/NSString+UrlEncode.m b/IOS-Categories/Foundation/NSString/NSString+UrlEncode.m
similarity index 100%
rename from categories/Foundation/NSString/NSString+UrlEncode.m
rename to IOS-Categories/Foundation/NSString/NSString+UrlEncode.m
diff --git a/categories/Foundation/NSTimer/NSTimer+Addition.h b/IOS-Categories/Foundation/NSTimer/NSTimer+Addition.h
similarity index 100%
rename from categories/Foundation/NSTimer/NSTimer+Addition.h
rename to IOS-Categories/Foundation/NSTimer/NSTimer+Addition.h
diff --git a/categories/Foundation/NSTimer/NSTimer+Addition.m b/IOS-Categories/Foundation/NSTimer/NSTimer+Addition.m
similarity index 100%
rename from categories/Foundation/NSTimer/NSTimer+Addition.m
rename to IOS-Categories/Foundation/NSTimer/NSTimer+Addition.m
diff --git a/categories/Foundation/NSTimer/NSTimer+Blocks.h b/IOS-Categories/Foundation/NSTimer/NSTimer+Blocks.h
similarity index 100%
rename from categories/Foundation/NSTimer/NSTimer+Blocks.h
rename to IOS-Categories/Foundation/NSTimer/NSTimer+Blocks.h
diff --git a/categories/Foundation/NSTimer/NSTimer+Blocks.m b/IOS-Categories/Foundation/NSTimer/NSTimer+Blocks.m
similarity index 100%
rename from categories/Foundation/NSTimer/NSTimer+Blocks.m
rename to IOS-Categories/Foundation/NSTimer/NSTimer+Blocks.m
diff --git a/categories/Foundation/NSURL/NSURL+Param.h b/IOS-Categories/Foundation/NSURL/NSURL+Param.h
similarity index 100%
rename from categories/Foundation/NSURL/NSURL+Param.h
rename to IOS-Categories/Foundation/NSURL/NSURL+Param.h
diff --git a/categories/Foundation/NSURL/NSURL+Param.m b/IOS-Categories/Foundation/NSURL/NSURL+Param.m
similarity index 100%
rename from categories/Foundation/NSURL/NSURL+Param.m
rename to IOS-Categories/Foundation/NSURL/NSURL+Param.m
diff --git a/categories/Images.xcassets/AppIcon.appiconset/Contents.json b/IOS-Categories/Images.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from categories/Images.xcassets/AppIcon.appiconset/Contents.json
rename to IOS-Categories/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/categories/Info.plist b/IOS-Categories/Info.plist
similarity index 100%
rename from categories/Info.plist
rename to IOS-Categories/Info.plist
diff --git a/categories/UIKit/UIBezierPath/UIBezierPath+SVG.h b/IOS-Categories/UIKit/UIBezierPath/UIBezierPath+SVG.h
similarity index 100%
rename from categories/UIKit/UIBezierPath/UIBezierPath+SVG.h
rename to IOS-Categories/UIKit/UIBezierPath/UIBezierPath+SVG.h
diff --git a/categories/UIKit/UIBezierPath/UIBezierPath+SVG.m b/IOS-Categories/UIKit/UIBezierPath/UIBezierPath+SVG.m
similarity index 100%
rename from categories/UIKit/UIBezierPath/UIBezierPath+SVG.m
rename to IOS-Categories/UIKit/UIBezierPath/UIBezierPath+SVG.m
diff --git a/categories/UIKit/UIButton/UIButton+Block.h b/IOS-Categories/UIKit/UIButton/UIButton+Block.h
similarity index 100%
rename from categories/UIKit/UIButton/UIButton+Block.h
rename to IOS-Categories/UIKit/UIButton/UIButton+Block.h
diff --git a/categories/UIKit/UIButton/UIButton+Block.m b/IOS-Categories/UIKit/UIButton/UIButton+Block.m
similarity index 100%
rename from categories/UIKit/UIButton/UIButton+Block.m
rename to IOS-Categories/UIKit/UIButton/UIButton+Block.m
diff --git a/categories/UIKit/UIButton/UIButton+CountDown.h b/IOS-Categories/UIKit/UIButton/UIButton+CountDown.h
similarity index 100%
rename from categories/UIKit/UIButton/UIButton+CountDown.h
rename to IOS-Categories/UIKit/UIButton/UIButton+CountDown.h
diff --git a/categories/UIKit/UIButton/UIButton+CountDown.m b/IOS-Categories/UIKit/UIButton/UIButton+CountDown.m
similarity index 100%
rename from categories/UIKit/UIButton/UIButton+CountDown.m
rename to IOS-Categories/UIKit/UIButton/UIButton+CountDown.m
diff --git a/categories/UIKit/UIButton/UIButton+Indicator.h b/IOS-Categories/UIKit/UIButton/UIButton+Indicator.h
similarity index 100%
rename from categories/UIKit/UIButton/UIButton+Indicator.h
rename to IOS-Categories/UIKit/UIButton/UIButton+Indicator.h
diff --git a/categories/UIKit/UIButton/UIButton+Indicator.m b/IOS-Categories/UIKit/UIButton/UIButton+Indicator.m
similarity index 100%
rename from categories/UIKit/UIButton/UIButton+Indicator.m
rename to IOS-Categories/UIKit/UIButton/UIButton+Indicator.m
diff --git a/categories/UIKit/UIColor/UIColor+Gradient.h b/IOS-Categories/UIKit/UIColor/UIColor+Gradient.h
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Gradient.h
rename to IOS-Categories/UIKit/UIColor/UIColor+Gradient.h
diff --git a/categories/UIKit/UIColor/UIColor+Gradient.m b/IOS-Categories/UIKit/UIColor/UIColor+Gradient.m
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Gradient.m
rename to IOS-Categories/UIKit/UIColor/UIColor+Gradient.m
diff --git a/categories/UIKit/UIColor/UIColor+HEX.h b/IOS-Categories/UIKit/UIColor/UIColor+HEX.h
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+HEX.h
rename to IOS-Categories/UIKit/UIColor/UIColor+HEX.h
diff --git a/categories/UIKit/UIColor/UIColor+HEX.m b/IOS-Categories/UIKit/UIColor/UIColor+HEX.m
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+HEX.m
rename to IOS-Categories/UIKit/UIColor/UIColor+HEX.m
diff --git a/categories/UIKit/UIColor/UIColor+Modify.h b/IOS-Categories/UIKit/UIColor/UIColor+Modify.h
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Modify.h
rename to IOS-Categories/UIKit/UIColor/UIColor+Modify.h
diff --git a/categories/UIKit/UIColor/UIColor+Modify.m b/IOS-Categories/UIKit/UIColor/UIColor+Modify.m
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Modify.m
rename to IOS-Categories/UIKit/UIColor/UIColor+Modify.m
diff --git a/categories/UIKit/UIColor/UIColor+Random.h b/IOS-Categories/UIKit/UIColor/UIColor+Random.h
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Random.h
rename to IOS-Categories/UIKit/UIColor/UIColor+Random.h
diff --git a/categories/UIKit/UIColor/UIColor+Random.m b/IOS-Categories/UIKit/UIColor/UIColor+Random.m
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Random.m
rename to IOS-Categories/UIKit/UIColor/UIColor+Random.m
diff --git a/categories/UIKit/UIColor/UIColor+Web.h b/IOS-Categories/UIKit/UIColor/UIColor+Web.h
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Web.h
rename to IOS-Categories/UIKit/UIColor/UIColor+Web.h
diff --git a/categories/UIKit/UIColor/UIColor+Web.m b/IOS-Categories/UIKit/UIColor/UIColor+Web.m
similarity index 100%
rename from categories/UIKit/UIColor/UIColor+Web.m
rename to IOS-Categories/UIKit/UIColor/UIColor+Web.m
diff --git a/categories/UIKit/UIDevice/UIDevice+Hardware.h b/IOS-Categories/UIKit/UIDevice/UIDevice+Hardware.h
similarity index 100%
rename from categories/UIKit/UIDevice/UIDevice+Hardware.h
rename to IOS-Categories/UIKit/UIDevice/UIDevice+Hardware.h
diff --git a/categories/UIKit/UIDevice/UIDevice+Hardware.m b/IOS-Categories/UIKit/UIDevice/UIDevice+Hardware.m
similarity index 100%
rename from categories/UIKit/UIDevice/UIDevice+Hardware.m
rename to IOS-Categories/UIKit/UIDevice/UIDevice+Hardware.m
diff --git a/categories/UIKit/UIImage/UIImage+Alpha.h b/IOS-Categories/UIKit/UIImage/UIImage+Alpha.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Alpha.h
rename to IOS-Categories/UIKit/UIImage/UIImage+Alpha.h
diff --git a/categories/UIKit/UIImage/UIImage+Alpha.m b/IOS-Categories/UIKit/UIImage/UIImage+Alpha.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Alpha.m
rename to IOS-Categories/UIKit/UIImage/UIImage+Alpha.m
diff --git a/categories/UIKit/UIImage/UIImage+Capture.h b/IOS-Categories/UIKit/UIImage/UIImage+Capture.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Capture.h
rename to IOS-Categories/UIKit/UIImage/UIImage+Capture.h
diff --git a/categories/UIKit/UIImage/UIImage+Capture.m b/IOS-Categories/UIKit/UIImage/UIImage+Capture.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Capture.m
rename to IOS-Categories/UIKit/UIImage/UIImage+Capture.m
diff --git a/categories/UIKit/UIImage/UIImage+Color.h b/IOS-Categories/UIKit/UIImage/UIImage+Color.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Color.h
rename to IOS-Categories/UIKit/UIImage/UIImage+Color.h
diff --git a/categories/UIKit/UIImage/UIImage+Color.m b/IOS-Categories/UIKit/UIImage/UIImage+Color.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Color.m
rename to IOS-Categories/UIKit/UIImage/UIImage+Color.m
diff --git a/categories/UIKit/UIImage/UIImage+FX.h b/IOS-Categories/UIKit/UIImage/UIImage+FX.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+FX.h
rename to IOS-Categories/UIKit/UIImage/UIImage+FX.h
diff --git a/categories/UIKit/UIImage/UIImage+FX.m b/IOS-Categories/UIKit/UIImage/UIImage+FX.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+FX.m
rename to IOS-Categories/UIKit/UIImage/UIImage+FX.m
diff --git a/categories/UIKit/UIImage/UIImage+FileName.h b/IOS-Categories/UIKit/UIImage/UIImage+FileName.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+FileName.h
rename to IOS-Categories/UIKit/UIImage/UIImage+FileName.h
diff --git a/categories/UIKit/UIImage/UIImage+FileName.m b/IOS-Categories/UIKit/UIImage/UIImage+FileName.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+FileName.m
rename to IOS-Categories/UIKit/UIImage/UIImage+FileName.m
diff --git a/categories/UIKit/UIImage/UIImage+Merge.h b/IOS-Categories/UIKit/UIImage/UIImage+Merge.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Merge.h
rename to IOS-Categories/UIKit/UIImage/UIImage+Merge.h
diff --git a/categories/UIKit/UIImage/UIImage+Merge.m b/IOS-Categories/UIKit/UIImage/UIImage+Merge.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Merge.m
rename to IOS-Categories/UIKit/UIImage/UIImage+Merge.m
diff --git a/categories/UIKit/UIImage/UIImage+Orientation.h b/IOS-Categories/UIKit/UIImage/UIImage+Orientation.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Orientation.h
rename to IOS-Categories/UIKit/UIImage/UIImage+Orientation.h
diff --git a/categories/UIKit/UIImage/UIImage+Orientation.m b/IOS-Categories/UIKit/UIImage/UIImage+Orientation.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Orientation.m
rename to IOS-Categories/UIKit/UIImage/UIImage+Orientation.m
diff --git a/categories/UIKit/UIImage/UIImage+RemoteSize.h b/IOS-Categories/UIKit/UIImage/UIImage+RemoteSize.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+RemoteSize.h
rename to IOS-Categories/UIKit/UIImage/UIImage+RemoteSize.h
diff --git a/categories/UIKit/UIImage/UIImage+RemoteSize.m b/IOS-Categories/UIKit/UIImage/UIImage+RemoteSize.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+RemoteSize.m
rename to IOS-Categories/UIKit/UIImage/UIImage+RemoteSize.m
diff --git a/categories/UIKit/UIImage/UIImage+Resize.h b/IOS-Categories/UIKit/UIImage/UIImage+Resize.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Resize.h
rename to IOS-Categories/UIKit/UIImage/UIImage+Resize.h
diff --git a/categories/UIKit/UIImage/UIImage+Resize.m b/IOS-Categories/UIKit/UIImage/UIImage+Resize.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+Resize.m
rename to IOS-Categories/UIKit/UIImage/UIImage+Resize.m
diff --git a/categories/UIKit/UIImage/UIImage+RoundedCorner.h b/IOS-Categories/UIKit/UIImage/UIImage+RoundedCorner.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+RoundedCorner.h
rename to IOS-Categories/UIKit/UIImage/UIImage+RoundedCorner.h
diff --git a/categories/UIKit/UIImage/UIImage+RoundedCorner.m b/IOS-Categories/UIKit/UIImage/UIImage+RoundedCorner.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+RoundedCorner.m
rename to IOS-Categories/UIKit/UIImage/UIImage+RoundedCorner.m
diff --git a/categories/UIKit/UIImage/UIImage+animatedGIF.h b/IOS-Categories/UIKit/UIImage/UIImage+animatedGIF.h
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+animatedGIF.h
rename to IOS-Categories/UIKit/UIImage/UIImage+animatedGIF.h
diff --git a/categories/UIKit/UIImage/UIImage+animatedGIF.m b/IOS-Categories/UIKit/UIImage/UIImage+animatedGIF.m
similarity index 100%
rename from categories/UIKit/UIImage/UIImage+animatedGIF.m
rename to IOS-Categories/UIKit/UIImage/UIImage+animatedGIF.m
diff --git a/categories/UIKit/UIImageView/UIImageView+Addition.h b/IOS-Categories/UIKit/UIImageView/UIImageView+Addition.h
similarity index 100%
rename from categories/UIKit/UIImageView/UIImageView+Addition.h
rename to IOS-Categories/UIKit/UIImageView/UIImageView+Addition.h
diff --git a/categories/UIKit/UIImageView/UIImageView+Addition.m b/IOS-Categories/UIKit/UIImageView/UIImageView+Addition.m
similarity index 100%
rename from categories/UIKit/UIImageView/UIImageView+Addition.m
rename to IOS-Categories/UIKit/UIImageView/UIImageView+Addition.m
diff --git a/categories/UIKit/UILable/UILabel+ESAdjustableLabel.h b/IOS-Categories/UIKit/UILable/UILabel+ESAdjustableLabel.h
similarity index 100%
rename from categories/UIKit/UILable/UILabel+ESAdjustableLabel.h
rename to IOS-Categories/UIKit/UILable/UILabel+ESAdjustableLabel.h
diff --git a/categories/UIKit/UILable/UILabel+ESAdjustableLabel.m b/IOS-Categories/UIKit/UILable/UILabel+ESAdjustableLabel.m
similarity index 100%
rename from categories/UIKit/UILable/UILabel+ESAdjustableLabel.m
rename to IOS-Categories/UIKit/UILable/UILabel+ESAdjustableLabel.m
diff --git a/categories/UIKit/UILable/UILabel+SuggestSize.h b/IOS-Categories/UIKit/UILable/UILabel+SuggestSize.h
similarity index 100%
rename from categories/UIKit/UILable/UILabel+SuggestSize.h
rename to IOS-Categories/UIKit/UILable/UILabel+SuggestSize.h
diff --git a/categories/UIKit/UILable/UILabel+SuggestSize.m b/IOS-Categories/UIKit/UILable/UILabel+SuggestSize.m
similarity index 100%
rename from categories/UIKit/UILable/UILabel+SuggestSize.m
rename to IOS-Categories/UIKit/UILable/UILabel+SuggestSize.m
diff --git a/categories/UIKit/UINavigationController/UINavigationController+BATransitions.h b/IOS-Categories/UIKit/UINavigationController/UINavigationController+BATransitions.h
similarity index 100%
rename from categories/UIKit/UINavigationController/UINavigationController+BATransitions.h
rename to IOS-Categories/UIKit/UINavigationController/UINavigationController+BATransitions.h
diff --git a/categories/UIKit/UINavigationController/UINavigationController+BATransitions.m b/IOS-Categories/UIKit/UINavigationController/UINavigationController+BATransitions.m
similarity index 100%
rename from categories/UIKit/UINavigationController/UINavigationController+BATransitions.m
rename to IOS-Categories/UIKit/UINavigationController/UINavigationController+BATransitions.m
diff --git a/categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.h b/IOS-Categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.h
similarity index 100%
rename from categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.h
rename to IOS-Categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.h
diff --git a/categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.m b/IOS-Categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.m
similarity index 100%
rename from categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.m
rename to IOS-Categories/UIKit/UINavigationController/UINavigationController+KeyboardFix.m
diff --git a/categories/UIKit/UIResponder/UIResponder+Chain.h b/IOS-Categories/UIKit/UIResponder/UIResponder+Chain.h
similarity index 100%
rename from categories/UIKit/UIResponder/UIResponder+Chain.h
rename to IOS-Categories/UIKit/UIResponder/UIResponder+Chain.h
diff --git a/categories/UIKit/UIResponder/UIResponder+Chain.m b/IOS-Categories/UIKit/UIResponder/UIResponder+Chain.m
similarity index 100%
rename from categories/UIKit/UIResponder/UIResponder+Chain.m
rename to IOS-Categories/UIKit/UIResponder/UIResponder+Chain.m
diff --git a/categories/UIKit/UIResponder/UIResponder+UIAdapt.h b/IOS-Categories/UIKit/UIResponder/UIResponder+UIAdapt.h
similarity index 100%
rename from categories/UIKit/UIResponder/UIResponder+UIAdapt.h
rename to IOS-Categories/UIKit/UIResponder/UIResponder+UIAdapt.h
diff --git a/categories/UIKit/UIResponder/UIResponder+UIAdapt.m b/IOS-Categories/UIKit/UIResponder/UIResponder+UIAdapt.m
similarity index 100%
rename from categories/UIKit/UIResponder/UIResponder+UIAdapt.m
rename to IOS-Categories/UIKit/UIResponder/UIResponder+UIAdapt.m
diff --git a/categories/UIKit/UIScrollView/UIScrollView+Addition.h b/IOS-Categories/UIKit/UIScrollView/UIScrollView+Addition.h
similarity index 100%
rename from categories/UIKit/UIScrollView/UIScrollView+Addition.h
rename to IOS-Categories/UIKit/UIScrollView/UIScrollView+Addition.h
diff --git a/categories/UIKit/UIScrollView/UIScrollView+Addition.m b/IOS-Categories/UIKit/UIScrollView/UIScrollView+Addition.m
similarity index 100%
rename from categories/UIKit/UIScrollView/UIScrollView+Addition.m
rename to IOS-Categories/UIKit/UIScrollView/UIScrollView+Addition.m
diff --git a/categories/UIKit/UIScrollView/UIScrollView+Pages.h b/IOS-Categories/UIKit/UIScrollView/UIScrollView+Pages.h
similarity index 100%
rename from categories/UIKit/UIScrollView/UIScrollView+Pages.h
rename to IOS-Categories/UIKit/UIScrollView/UIScrollView+Pages.h
diff --git a/categories/UIKit/UIScrollView/UIScrollView+Pages.m b/IOS-Categories/UIKit/UIScrollView/UIScrollView+Pages.m
similarity index 100%
rename from categories/UIKit/UIScrollView/UIScrollView+Pages.m
rename to IOS-Categories/UIKit/UIScrollView/UIScrollView+Pages.m
diff --git a/categories/UIKit/UISearchBar/UISearchBar+Blocks.h b/IOS-Categories/UIKit/UISearchBar/UISearchBar+Blocks.h
similarity index 100%
rename from categories/UIKit/UISearchBar/UISearchBar+Blocks.h
rename to IOS-Categories/UIKit/UISearchBar/UISearchBar+Blocks.h
diff --git a/categories/UIKit/UISearchBar/UISearchBar+Blocks.m b/IOS-Categories/UIKit/UISearchBar/UISearchBar+Blocks.m
similarity index 100%
rename from categories/UIKit/UISearchBar/UISearchBar+Blocks.m
rename to IOS-Categories/UIKit/UISearchBar/UISearchBar+Blocks.m
diff --git a/categories/UIKit/UITableViewCell/UITableViewCell+NIB.h b/IOS-Categories/UIKit/UITableViewCell/UITableViewCell+NIB.h
similarity index 100%
rename from categories/UIKit/UITableViewCell/UITableViewCell+NIB.h
rename to IOS-Categories/UIKit/UITableViewCell/UITableViewCell+NIB.h
diff --git a/categories/UIKit/UITableViewCell/UITableViewCell+NIB.m b/IOS-Categories/UIKit/UITableViewCell/UITableViewCell+NIB.m
similarity index 100%
rename from categories/UIKit/UITableViewCell/UITableViewCell+NIB.m
rename to IOS-Categories/UIKit/UITableViewCell/UITableViewCell+NIB.m
diff --git a/categories/UIKit/UITextField/UITextField+Blocks.h b/IOS-Categories/UIKit/UITextField/UITextField+Blocks.h
similarity index 100%
rename from categories/UIKit/UITextField/UITextField+Blocks.h
rename to IOS-Categories/UIKit/UITextField/UITextField+Blocks.h
diff --git a/categories/UIKit/UITextField/UITextField+Blocks.m b/IOS-Categories/UIKit/UITextField/UITextField+Blocks.m
similarity index 100%
rename from categories/UIKit/UITextField/UITextField+Blocks.m
rename to IOS-Categories/UIKit/UITextField/UITextField+Blocks.m
diff --git a/categories/UIKit/UITextView/UITextView+PlaceHolder.h b/IOS-Categories/UIKit/UITextView/UITextView+PlaceHolder.h
similarity index 100%
rename from categories/UIKit/UITextView/UITextView+PlaceHolder.h
rename to IOS-Categories/UIKit/UITextView/UITextView+PlaceHolder.h
diff --git a/categories/UIKit/UITextView/UITextView+PlaceHolder.m b/IOS-Categories/UIKit/UITextView/UITextView+PlaceHolder.m
similarity index 100%
rename from categories/UIKit/UITextView/UITextView+PlaceHolder.m
rename to IOS-Categories/UIKit/UITextView/UITextView+PlaceHolder.m
diff --git a/categories/UIKit/UIView/UIView+Animation.h b/IOS-Categories/UIKit/UIView/UIView+Animation.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+Animation.h
rename to IOS-Categories/UIKit/UIView/UIView+Animation.h
diff --git a/categories/UIKit/UIView/UIView+Animation.m b/IOS-Categories/UIKit/UIView/UIView+Animation.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+Animation.m
rename to IOS-Categories/UIKit/UIView/UIView+Animation.m
diff --git a/categories/UIKit/UIView/UIView+BlockGesture.h b/IOS-Categories/UIKit/UIView/UIView+BlockGesture.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+BlockGesture.h
rename to IOS-Categories/UIKit/UIView/UIView+BlockGesture.h
diff --git a/categories/UIKit/UIView/UIView+BlockGesture.m b/IOS-Categories/UIKit/UIView/UIView+BlockGesture.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+BlockGesture.m
rename to IOS-Categories/UIKit/UIView/UIView+BlockGesture.m
diff --git a/categories/UIKit/UIView/UIView+Debug.h b/IOS-Categories/UIKit/UIView/UIView+Debug.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+Debug.h
rename to IOS-Categories/UIKit/UIView/UIView+Debug.h
diff --git a/categories/UIKit/UIView/UIView+Debug.m b/IOS-Categories/UIKit/UIView/UIView+Debug.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+Debug.m
rename to IOS-Categories/UIKit/UIView/UIView+Debug.m
diff --git a/categories/UIKit/UIView/UIView+Frame.h b/IOS-Categories/UIKit/UIView/UIView+Frame.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+Frame.h
rename to IOS-Categories/UIKit/UIView/UIView+Frame.h
diff --git a/categories/UIKit/UIView/UIView+Frame.m b/IOS-Categories/UIKit/UIView/UIView+Frame.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+Frame.m
rename to IOS-Categories/UIKit/UIView/UIView+Frame.m
diff --git a/categories/UIKit/UIView/UIView+Nib.h b/IOS-Categories/UIKit/UIView/UIView+Nib.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+Nib.h
rename to IOS-Categories/UIKit/UIView/UIView+Nib.h
diff --git a/categories/UIKit/UIView/UIView+Nib.m b/IOS-Categories/UIKit/UIView/UIView+Nib.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+Nib.m
rename to IOS-Categories/UIKit/UIView/UIView+Nib.m
diff --git a/categories/UIKit/UIView/UIView+RecursiveDescription.h b/IOS-Categories/UIKit/UIView/UIView+RecursiveDescription.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+RecursiveDescription.h
rename to IOS-Categories/UIKit/UIView/UIView+RecursiveDescription.h
diff --git a/categories/UIKit/UIView/UIView+RecursiveDescription.m b/IOS-Categories/UIKit/UIView/UIView+RecursiveDescription.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+RecursiveDescription.m
rename to IOS-Categories/UIKit/UIView/UIView+RecursiveDescription.m
diff --git a/categories/UIKit/UIView/UIView+Screenshot.h b/IOS-Categories/UIKit/UIView/UIView+Screenshot.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+Screenshot.h
rename to IOS-Categories/UIKit/UIView/UIView+Screenshot.h
diff --git a/categories/UIKit/UIView/UIView+Screenshot.m b/IOS-Categories/UIKit/UIView/UIView+Screenshot.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+Screenshot.m
rename to IOS-Categories/UIKit/UIView/UIView+Screenshot.m
diff --git a/categories/UIKit/UIView/UIView+Toast.h b/IOS-Categories/UIKit/UIView/UIView+Toast.h
similarity index 100%
rename from categories/UIKit/UIView/UIView+Toast.h
rename to IOS-Categories/UIKit/UIView/UIView+Toast.h
diff --git a/categories/UIKit/UIView/UIView+Toast.m b/IOS-Categories/UIKit/UIView/UIView+Toast.m
similarity index 100%
rename from categories/UIKit/UIView/UIView+Toast.m
rename to IOS-Categories/UIKit/UIView/UIView+Toast.m
diff --git a/categories/UIKit/UIViewController/UIViewController+RecursiveDescription.h b/IOS-Categories/UIKit/UIViewController/UIViewController+RecursiveDescription.h
similarity index 100%
rename from categories/UIKit/UIViewController/UIViewController+RecursiveDescription.h
rename to IOS-Categories/UIKit/UIViewController/UIViewController+RecursiveDescription.h
diff --git a/categories/UIKit/UIViewController/UIViewController+RecursiveDescription.m b/IOS-Categories/UIKit/UIViewController/UIViewController+RecursiveDescription.m
similarity index 100%
rename from categories/UIKit/UIViewController/UIViewController+RecursiveDescription.m
rename to IOS-Categories/UIKit/UIViewController/UIViewController+RecursiveDescription.m
diff --git a/categories/UIKit/UIViewController/UIViewController+Visible.h b/IOS-Categories/UIKit/UIViewController/UIViewController+Visible.h
similarity index 100%
rename from categories/UIKit/UIViewController/UIViewController+Visible.h
rename to IOS-Categories/UIKit/UIViewController/UIViewController+Visible.h
diff --git a/categories/UIKit/UIViewController/UIViewController+Visible.m b/IOS-Categories/UIKit/UIViewController/UIViewController+Visible.m
similarity index 100%
rename from categories/UIKit/UIViewController/UIViewController+Visible.m
rename to IOS-Categories/UIKit/UIViewController/UIViewController+Visible.m
diff --git a/categories/UIKit/UIWebView/UIWebView+Alert.h b/IOS-Categories/UIKit/UIWebView/UIWebView+Alert.h
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Alert.h
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Alert.h
diff --git a/categories/UIKit/UIWebView/UIWebView+Alert.m b/IOS-Categories/UIKit/UIWebView/UIWebView+Alert.m
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Alert.m
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Alert.m
diff --git a/categories/UIKit/UIWebView/UIWebView+Blocks.h b/IOS-Categories/UIKit/UIWebView/UIWebView+Blocks.h
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Blocks.h
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Blocks.h
diff --git a/categories/UIKit/UIWebView/UIWebView+Blocks.m b/IOS-Categories/UIKit/UIWebView/UIWebView+Blocks.m
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Blocks.m
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Blocks.m
diff --git a/categories/UIKit/UIWebView/UIWebView+Canvas.h b/IOS-Categories/UIKit/UIWebView/UIWebView+Canvas.h
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Canvas.h
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Canvas.h
diff --git a/categories/UIKit/UIWebView/UIWebView+Canvas.m b/IOS-Categories/UIKit/UIWebView/UIWebView+Canvas.m
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Canvas.m
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Canvas.m
diff --git a/categories/UIKit/UIWebView/UIWebView+JS.h b/IOS-Categories/UIKit/UIWebView/UIWebView+JS.h
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+JS.h
rename to IOS-Categories/UIKit/UIWebView/UIWebView+JS.h
diff --git a/categories/UIKit/UIWebView/UIWebView+JS.m b/IOS-Categories/UIKit/UIWebView/UIWebView+JS.m
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+JS.m
rename to IOS-Categories/UIKit/UIWebView/UIWebView+JS.m
diff --git a/categories/UIKit/UIWebView/UIWebView+Load.m b/IOS-Categories/UIKit/UIWebView/UIWebView+Load.m
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Load.m
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Load.m
diff --git a/categories/UIKit/UIWebView/UIWebView+Style.h b/IOS-Categories/UIKit/UIWebView/UIWebView+Style.h
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Style.h
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Style.h
diff --git a/categories/UIKit/UIWebView/UIWebView+Style.m b/IOS-Categories/UIKit/UIWebView/UIWebView+Style.m
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+Style.m
rename to IOS-Categories/UIKit/UIWebView/UIWebView+Style.m
diff --git a/categories/UIKit/UIWebView/UIWebView+load.h b/IOS-Categories/UIKit/UIWebView/UIWebView+load.h
similarity index 100%
rename from categories/UIKit/UIWebView/UIWebView+load.h
rename to IOS-Categories/UIKit/UIWebView/UIWebView+load.h
diff --git a/categories/UIKit/UIWebView/WebView+Debug.h b/IOS-Categories/UIKit/UIWebView/WebView+Debug.h
similarity index 100%
rename from categories/UIKit/UIWebView/WebView+Debug.h
rename to IOS-Categories/UIKit/UIWebView/WebView+Debug.h
diff --git a/categories/UIKit/UIWebView/WebView+Debug.m b/IOS-Categories/UIKit/UIWebView/WebView+Debug.m
similarity index 100%
rename from categories/UIKit/UIWebView/WebView+Debug.m
rename to IOS-Categories/UIKit/UIWebView/WebView+Debug.m
diff --git a/categories/UIKit/UIWindow/UIWindow+Hierarchy.h b/IOS-Categories/UIKit/UIWindow/UIWindow+Hierarchy.h
similarity index 100%
rename from categories/UIKit/UIWindow/UIWindow+Hierarchy.h
rename to IOS-Categories/UIKit/UIWindow/UIWindow+Hierarchy.h
diff --git a/categories/UIKit/UIWindow/UIWindow+Hierarchy.m b/IOS-Categories/UIKit/UIWindow/UIWindow+Hierarchy.m
similarity index 100%
rename from categories/UIKit/UIWindow/UIWindow+Hierarchy.m
rename to IOS-Categories/UIKit/UIWindow/UIWindow+Hierarchy.m
diff --git a/categories/bg.jpg b/IOS-Categories/bg.jpg
similarity index 100%
rename from categories/bg.jpg
rename to IOS-Categories/bg.jpg
diff --git a/categories/main.m b/IOS-Categories/main.m
similarity index 100%
rename from categories/main.m
rename to IOS-Categories/main.m
diff --git a/categories/Foundation/NSArray/NSArray+SafeAccess.h b/categories/Foundation/NSArray/NSArray+SafeAccess.h
deleted file mode 100644
index c80092d..0000000
--- a/categories/Foundation/NSArray/NSArray+SafeAccess.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  NSArray+SafeAccess.h
-//  IOS-Categories
-//
-//  Created by Jakey on 15/2/8.
-//  Copyright (c) 2015年 www.skyfox.org. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface NSArray (SafeAccess)
--(id)objectWithIndex:(NSUInteger)index;
-@end
diff --git a/categories/Foundation/NSArray/NSArray+SafeAccess.m b/categories/Foundation/NSArray/NSArray+SafeAccess.m
deleted file mode 100644
index 1c6f8a9..0000000
--- a/categories/Foundation/NSArray/NSArray+SafeAccess.m
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  NSArray+SafeAccess.m
-//  IOS-Categories
-//
-//  Created by Jakey on 15/2/8.
-//  Copyright (c) 2015年 www.skyfox.org. All rights reserved.
-//
-
-#import "NSArray+SafeAccess.h"
-
-@implementation NSArray (SafeAccess)
--(id)objectWithIndex:(NSUInteger)index{
-    if (index <self.count) {
-        return self[index];
-    }else{
-        return nil;
-    }
-}
-@end
diff --git a/categories/Foundation/NSDictionary/NSDictionary+SafeAccess.h b/categories/Foundation/NSDictionary/NSDictionary+SafeAccess.h
deleted file mode 100644
index 5261739..0000000
--- a/categories/Foundation/NSDictionary/NSDictionary+SafeAccess.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-//  NSDictionary+SafeAccess.h
-//  IOS-Categories
-//
-//  Created by Jakey on 15/1/25.
-//  Copyright (c) 2015年 www.skyfox.org. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface NSDictionary (SafeAccess)
-- (NSString*)stringForKey:(NSString*)key;
-
-- (NSNumber*)numberForKey:(NSString*)key;
-
-- (NSArray*)arrayForKey:(NSString*)key;
-
-- (NSDictionary*)dictionaryForKey:(NSString*)key;
-
-- (NSInteger)integerForKey:(id)key;
-
-- (BOOL)boolForKey:(id)key;
-
-- (int16_t)int16ForKey:(id)key;
-
-- (int32_t)int32ForKey:(id)key;
-
-- (int64_t)int64ForKey:(id)key;
-
-- (short)shortForKey:(id)key;
-
-- (float)floatForKey:(id)key;
-
-- (double)doubleForKey:(id)key;
-
-@end
diff --git a/categories/Foundation/NSDictionary/NSMutableDictionary+IFNil.h b/categories/Foundation/NSDictionary/NSMutableDictionary+IFNil.h
deleted file mode 100644
index e78c5d0..0000000
--- a/categories/Foundation/NSDictionary/NSMutableDictionary+IFNil.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  NSMutableDictionary+IFNil.h
-//  IOS-Categories
-//
-//  Created by Jakey on 14/12/15.
-//  Copyright (c) 2014年 www.skyfox.org. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface NSMutableDictionary (IFNil)
-- (void)setValueIfNotNil:(id)value forKey:(NSString *)key;
-@end
diff --git a/categories/Foundation/NSDictionary/NSMutableDictionary+IFNil.m b/categories/Foundation/NSDictionary/NSMutableDictionary+IFNil.m
deleted file mode 100644
index af81b87..0000000
--- a/categories/Foundation/NSDictionary/NSMutableDictionary+IFNil.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  NSMutableDictionary+IFNil.m
-//  IOS-Categories
-//
-//  Created by Jakey on 14/12/15.
-//  Copyright (c) 2014年 www.skyfox.org. All rights reserved.
-//
-
-#import "NSMutableDictionary+IFNil.h"
-
-@implementation NSMutableDictionary (IFNil)
-- (void)setValueIfNotNil:(id)value forKey:(NSString *)key {
-    if (value != nil) {
-        [self setValue:value forKey:key];
-    }
-}
-@end