Resolved problem with classes being defined twice.