Re-organize files into directories