Fixed module imports
License fixes