reorganized files

reorganized files, adjusted file names