[PR] Update with new structure and files