Reorganize file structure for framework