Adding copyrights and clean up imports