Reorganize files into separate directories