diff --git a/README.md b/README.md
old mode 100755
new mode 100644
index 0efc5e21..43aa0278
--- a/README.md
+++ b/README.md
@@ -545,10 +545,6 @@ If you have any questions/issues/comments please feel free to create an issue or
-| | |
-| --- | ----------- |
-| iOS Demo | Android Demo |
-
[](#table-of-contents)
diff --git a/images/demo-android.gif b/images/demo-android.gif
old mode 100755
new mode 100644
diff --git a/images/demo-ios.gif b/images/demo-ios.gif
old mode 100755
new mode 100644
diff --git a/lerna.json b/lerna.json
old mode 100755
new mode 100644
diff --git a/package.json b/package.json
old mode 100755
new mode 100644
diff --git a/packages/collectionview/CHANGELOG.md b/packages/collectionview/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/packages/collectionview/README.md b/packages/collectionview/README.md
old mode 100755
new mode 100644
diff --git a/packages/collectionview/package.json b/packages/collectionview/package.json
old mode 100755
new mode 100644
index 355da6ec..555a1b55
--- a/packages/collectionview/package.json
+++ b/packages/collectionview/package.json
@@ -2,10 +2,10 @@
"name": "@nativescript-community/ui-collectionview",
"version": "4.0.46",
"description": "Allows you to easily add a collection view (grid list view) to your projects. Supports vertical and horizontal modes, templating, and more.",
- "main": "./collectionview",
- "module": "./collectionview.mjs",
+ "main": "./index",
+ "module": "./index.mjs",
"sideEffects": false,
- "typings": "./collectionview.d.ts",
+ "typings": "./index.d.ts",
"scripts": {
"build": "npm run tsc && npm run readme",
"build.all": "npm run build && npm run build.angular",
diff --git a/packages/collectionview/platforms/android/AndroidManifest.xml b/packages/collectionview/platforms/android/AndroidManifest.xml
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/include.gradle b/packages/collectionview/platforms/android/include.gradle
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/Adapter.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/Adapter.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/AdapterInterface.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/AdapterInterface.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/CollectionViewCellHolder.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/CollectionViewCellHolder.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/GridLayoutManager.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/GridLayoutManager.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/OnScrollListener.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/OnScrollListener.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/PreCachingGridLayoutManager.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/PreCachingGridLayoutManager.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/RecyclerView.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/RecyclerView.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/SizeChangedListener.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/SizeChangedListener.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/java/com/nativescript/collectionview/SpanSizeLookup.java b/packages/collectionview/platforms/android/java/com/nativescript/collectionview/SpanSizeLookup.java
old mode 100755
new mode 100644
diff --git a/packages/collectionview/platforms/android/res/layout/collectionview.xml b/packages/collectionview/platforms/android/res/layout/collectionview.xml
old mode 100755
new mode 100644
diff --git a/packages/collectionview/tsconfig.json b/packages/collectionview/tsconfig.json
old mode 100755
new mode 100644
diff --git a/packages/collectionview/typings/arv.d.ts b/packages/collectionview/typings/arv.d.ts
old mode 100755
new mode 100644
diff --git a/packages/waterfall/CHANGELOG.md b/packages/waterfall/CHANGELOG.md
old mode 100755
new mode 100644
diff --git a/packages/waterfall/README.md b/packages/waterfall/README.md
old mode 100755
new mode 100644
diff --git a/packages/waterfall/blueprint.md b/packages/waterfall/blueprint.md
index 89b371ab..43ff706a 100644
--- a/packages/waterfall/blueprint.md
+++ b/packages/waterfall/blueprint.md
@@ -3,10 +3,6 @@
{{ template:badges }}
{{ template:description }}
-| | |
-| --- | ----------- |
-| iOS Demo | Android Demo |
-
{{ template:toc }}
## Installation
diff --git a/packages/waterfall/package.json b/packages/waterfall/package.json
old mode 100755
new mode 100644
diff --git a/packages/waterfall/platforms/ios/Podfile b/packages/waterfall/platforms/ios/Podfile
old mode 100755
new mode 100644
diff --git a/packages/waterfall/tsconfig.json b/packages/waterfall/tsconfig.json
old mode 100755
new mode 100644
diff --git a/packages/waterfall/typings/objc!CollectionViewWaterfallLayout.d.ts b/packages/waterfall/typings/objc!CollectionViewWaterfallLayout.d.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/angular/collectionview-comp.ts b/src/collectionview/angular/collectionview-comp.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/angular/index.ts b/src/collectionview/angular/index.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/angular/package.json b/src/collectionview/angular/package.json
old mode 100755
new mode 100644
diff --git a/src/collectionview/angular/tsconfig.json b/src/collectionview/angular/tsconfig.json
old mode 100755
new mode 100644
diff --git a/src/collectionview/index-common.ts b/src/collectionview/index-common.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/index.android.ts b/src/collectionview/index.android.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/index.d.ts b/src/collectionview/index.d.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/index.ios.ts b/src/collectionview/index.ios.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/react/index.tsx b/src/collectionview/react/index.tsx
old mode 100755
new mode 100644
diff --git a/src/collectionview/references.d.ts b/src/collectionview/references.d.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/svelte/index.ts b/src/collectionview/svelte/index.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/typings/arv.d.ts b/src/collectionview/typings/arv.d.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/typings/flexibleAdapter.d.ts.old b/src/collectionview/typings/flexibleAdapter.d.ts.old
old mode 100755
new mode 100644
diff --git a/src/collectionview/vue/component.ts b/src/collectionview/vue/component.ts
old mode 100755
new mode 100644
diff --git a/src/collectionview/vue/index.ts b/src/collectionview/vue/index.ts
old mode 100755
new mode 100644
diff --git a/src/waterfall/index.android.ts b/src/waterfall/index.android.ts
old mode 100755
new mode 100644
diff --git a/src/waterfall/index.d.ts b/src/waterfall/index.d.ts
old mode 100755
new mode 100644
diff --git a/src/waterfall/index.ios.ts b/src/waterfall/index.ios.ts
old mode 100755
new mode 100644
diff --git a/src/waterfall/typings/objc!CollectionViewWaterfallLayout.d.ts b/src/waterfall/typings/objc!CollectionViewWaterfallLayout.d.ts
old mode 100755
new mode 100644
diff --git a/tools b/tools
index c7f5d9a3..e7267cc5 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit c7f5d9a321396d1ebca18c2b8f3653840b1dd5c3
+Subproject commit e7267cc5dd8f79cea27762dd4e96c23bcfabb5ec
diff --git a/tsconfig.json b/tsconfig.json
old mode 100755
new mode 100644