Reorganized some files into directories