#982 organization of files