Restructured code and interface