Restructured the framework