re-organize the folder hierarchies