Added extra copyrights to license
Changed import statements to the new namespace