Better organization for more languages