Re-organize folders.