Restructured code base.