Version and folder-structure patch