fix copyrights
fix namespaces