restructuring files. a lot of files.