Restructured framework code