Refactor imports
Add license