Better organization of files