Update and reorganize repository