Restructuring and merging repo ...