Organise imports, and better native loading support