updating file names and organization