Better organization for the file structure