Moved framework bits into Framework folder