Reorganize according to framework