Re-organize folders
Prepare to merge