Completed the version that uses framework bundle rather than git submodule

Completed the version that uses framework bundle rather than git submodule