Rearranged a framework