A little bit of organization of files