Restructuring of Code finished