Rearranged Software Architecture