Fixed Imports and Updated Licences