Did some organizing of files into subdirectories