copyright updated; imports renamed; misc fixes