Upver the main file
No .bundle
Reduse deps for 1.8