PUAPI changes in file structure