Convert initial work to OO layout.