Reorganized files into dirs