Revert "Separated Frame from Master branch"

This reverts commit c4ed75ab76b9ceb16d43164a73d00a5e25b59652.