Reorganize framework files