Fix imports
Add missing license headers