Adjusted file structure, dropping short codes