Reorganize file structure of v7