re-organize the file structure